From: sambufe <samuel.bufe@publicispixelpark.de>
Date: Mon, 11 Sep 2017 11:02:20 +0000 (+0200)
Subject: BERFBB-3871
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=68b021d82baaa665fd6078a575660a25be4f97de;p=pixelpark%2Fhiera.git

BERFBB-3871
---

diff --git a/customer/fbb-www/test.yaml b/customer/fbb-www/test.yaml
index 88294b50..3d10ad43 100644
--- a/customer/fbb-www/test.yaml
+++ b/customer/fbb-www/test.yaml
@@ -251,7 +251,7 @@ php::settings:
 
 infra::profile::apache::htdigest:
   server:
-    www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQkzCNaKrUkNv5Jeq7Ebr53aJX3KDt5n9kI7yy050w71v1LrpdAkkESTZeuKLLjswjcMC5ICL5wMSwn+7aj6Gcn259EECdsVZydD/VMsSHEVN3aLUrByNuM4+mFpK0Jthi0hi8zqcej5e3mdQPiT6gcfai29htoPHS23zruLnNIkmJ62tpcWaGrYp+eXVVm522jbmL/+oewNv/6YFUrYBPXdomznkC/ReGB1YG/fbz3Vt5UaWFbZ19+8YxHHMlT5nyvkGNsWhVKKeSDgacDLJ9Gr0zw/iFs1lLojEGt9HarRYWtSGt5PbhhYLxtt75OLU+BA0q/gZTbGiHvguQ2rwqjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCIaKd8NKWcQ5fw1bElllIogBDy3gDC0xHpz9Zxv4+6nRST]
+    www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEALaYPK5bzDvMj10eCh8VLQyDLnAbSWiLdC115p99Y0ynvryRZ4asbBRM4FYFsug1nmBR6Ww3SUN6utzj7gODpAlExGR0G1Nx81kVeRp4k5Um5KC+afsosER7LCSCyXwuJkZnL/KXD9syZhNgm6qoq8FYJVOuWpXXgovDiZxKnB5tuCyUwnux7pyZxn6q1T20TtjfqVm1urZBbdRv0B0KqTLwW5JkG6J9iIUKeLLxwpdrtz0unC/pOixBeNzoskXZWacOtve5xAVQ5TzYruKtntbRF1zmZBVljFi/FknWfD317qAHbhGQdbqdTmkOwToE83WcZva94Ocm9hNWeliZTTTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB9DAbptW926ydjeDlkwog/gBATQlhn7+Kawp7EkrwUaIph]
   starsberlin:
     starsberlin: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAvNAPwZTzWHLRCIDDMFtt4UflNhwGjsn/ir6xO3RukXWzCeG7dAQIXBaScMDiXBoPoAUmZrErDsuL7ktrjZygYlRvEO5yH3Kz/W0ZTgyOjZ1YMMbzO41fMPavvMCYaPgwmAO+A9FV7sf3QtUg5xIGlVihRaozycQCZyQzMgNCmG6FT6h7jGqIT15X6ijG9OziZPRUx2wBpnb2ktioDXeI+pzJ4NNe2SIyOA/s9CpilkYUmQz8BtGivP5FPMSxtVpN59BYouTPIB9mjY0ZZC5I7ao6qBw3q8m0rZpflXjYS92moNsBTPaLMl3+HZXMqW8yZIH6wWHw4uxE+TFfrCt3yzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBChVIfgeaQIwFP4wpIS0jYggBD2up0B81abo4tHcyX9rl+4]
   securitastxl:
@@ -305,6 +305,17 @@ infra::profile::apache::pp_vhosts:
           - FollowSymLinks
         allow_override:
           - None
+      - provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: server
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
+        require:
+          #     lb-healthcheck---------------|fbb nat-------|parksystem BERFBB-3392---------------------|flughafen----------------------|
+          - 'ip 192.168.66.251 192.168.66.252 172.17.85.0/24 81.145.60.194 212.46.144.129 80.154.135.222 194.174.73.0/24 194.174.78.0/24'
   download-berlin-airport:
     docroot: '/var/www/download-berlin-airport'
     servername: tstdownload.berlin-airport.de
@@ -334,6 +345,17 @@ infra::profile::apache::pp_vhosts:
           - FollowSymLinks
         allow_override:
           - None
+      - provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: server
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
+        require:
+          #     lb-healthcheck---------------|fbb nat-------|parksystem BERFBB-3392---------------------|flughafen----------------------|
+          - 'ip 192.168.66.251 192.168.66.252 172.17.85.0/24 81.145.60.194 212.46.144.129 80.154.135.222 194.174.73.0/24 194.174.78.0/24'
     rewrites:
       - comment: 'FBBKERNSERV-285'
         rewrite_rule:
@@ -362,6 +384,17 @@ infra::profile::apache::pp_vhosts:
           - FollowSymLinks Indexes
         allow_override:
           - None
+      - provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: server
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
+        require:
+          #     lb-healthcheck---------------|fbb nat-------|parksystem BERFBB-3392---------------------|flughafen----------------------|
+          - 'ip 192.168.66.251 192.168.66.252 172.17.85.0/24 81.145.60.194 212.46.144.129 80.154.135.222 194.174.73.0/24 194.174.78.0/24'
     rewrites:
       - comment: 'FBBKERNSERV-285'
         rewrite_rule:
@@ -397,6 +430,17 @@ infra::profile::apache::pp_vhosts:
           - FollowSymLinks
         allow_override:
           - None
+      - provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: server
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
+        require:
+          #     lb-healthcheck---------------|fbb nat-------|parksystem BERFBB-3392---------------------|flughafen----------------------|
+          - 'ip 192.168.66.251 192.168.66.252 172.17.85.0/24 81.145.60.194 212.46.144.129 80.154.135.222 194.174.73.0/24 194.174.78.0/24'
   berlin-airport:
     docroot: '/var/www/berlin-airport'
     servername: tst-www-fbb.pixelpark.net
@@ -471,6 +515,17 @@ infra::profile::apache::pp_vhosts:
           - FollowSymLinks
         allow_override:
           - None
+      - provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: server
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
+        require:
+          #     lb-healthcheck---------------|fbb nat-------|parksystem BERFBB-3392---------------------|flughafen----------------------|
+          - 'ip 192.168.66.251 192.168.66.252 172.17.85.0/24 81.145.60.194 212.46.144.129 80.154.135.222 194.174.73.0/24 194.174.78.0/24'
       - provider: location
         path: '/starsberlin/'
         auth_type: Digest