]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
fbb-api - allow api access from specific IPs (remove my IP and add rules on tst-api02)
authorThomas Dalichow <thomas.dalichow@publicispixelpark.de>
Wed, 20 Jun 2018 10:39:57 +0000 (12:39 +0200)
committerThomas Dalichow <thomas.dalichow@publicispixelpark.de>
Wed, 20 Jun 2018 10:39:57 +0000 (12:39 +0200)
customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml

index 03515a3ac213bd4b8844bcfb5c38ff29f19fb31b..a05cac6002e53647f5b37435ca5e50a217978701 100644 (file)
@@ -46,9 +46,8 @@ infra::profile::apache::pp_vhosts:
           requires:
             - 'valid-user'
             # BERFBB-4676
-            - 'ip 217.66.48.0/20 10.90.13.0/24 10.90.14.0/24 194.174.72.0/21 194.115.26.6 10.99.1.10'
+            - 'ip 217.66.48.0/20 10.90.13.0/24 10.90.14.0/24 194.174.72.0/21 194.115.26.6'
           enforce: any
-
     rewrites:
       - alias:
         comment: 'Alles auf https umleiten'
index 03c3af3c8116e78e0d5d5f69722a536704ca6863..d2b7a2b7dfdee6040beb855e3014111dfd1debd5 100644 (file)
@@ -35,7 +35,12 @@ infra::profile::apache::pp_vhosts:
         auth_digest_provider: file
         auth_digest_algorithm: MD5
         auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'
+        require:
+          requires:
+            - 'valid-user'
+            # BERFBB-4676
+            - 'ip 217.66.48.0/20 10.90.13.0/24 10.90.14.0/24 194.174.72.0/21 194.115.26.6'
+          enforce: any
     rewrites:
       - alias:
         comment: 'Alles auf https umleiten'