fbb-api - Deactivating general HTTP-Auth, activate specific HTTP-Auth for TST + PRD...

diff --git a/customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml b/customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml
index adcf6f9b7cdde8b46dec54f272ad9e66d26c88ee..383d3156cb185e550d7f677b5de4b21b775a9611 100644 (file)
--- a/customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml
@@ -40,17 +40,29 @@ infra::profile::apache::pp_vhosts:
         directoryindex: index.php index.html
       - location1:
         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'
-#    rewrites:
-#      - alias:
-#        comment: 'Alles auf https umleiten'
-#        rewrite_cond:
-#          - '%%{ich-trickse}{HTTPS} !=on'
-#        rewrite_rule:
-#          - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]'
+        path: '/api/v1/cdm-ham/system-status-handler'
+        auth_type: Basic
+        auth_name: "Restricted Content"
+        auth_user_file: '/etc/httpd/conf/basic-auth-hh'
+        require:
+          requires:
+            - 'user hh-push'
+            # IP Hamburg
+            - 'ip 10.5.13.144'
+            # Pixelpark Admin-Netz
+            -  '217.66.51.'
+          enforce: all
+      - location2:
+        provider: location
+        path: '/api/v1/cdm-ham/notification-handler'
+        auth_type: Basic
+        auth_name: "Restricted Content"
+        auth_user_file: '/etc/httpd/conf/basic-auth-hh'
+        require:
+          requires:
+            - 'user hh-push'
+            # IP Hamburg
+            - 'ip 10.5.13.144'
+            # Pixelpark Admin-Netz
+            -  '217.66.51.'
+          enforce: all

diff --git a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
index 27f96f116f0f49fb76941098b8915b6484ba09ea..0ce65634837deb831d45b24d170fcee66b17a0e7 100644 (file)
--- a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
@@ -55,23 +55,29 @@ infra::profile::apache::pp_vhosts:
         directoryindex: index.php index.html
       - location1:
         provider: location
-        path: '/my-test1'
+        path: '/api/v1/cdm-ham/system-status-handler'
         auth_type: Basic
         auth_name: "Restricted Content"
         auth_user_file: '/etc/httpd/conf/basic-auth-hh'
         require:
           requires:
             - 'user hh-push'
-            - 'ip 10.5.13.142 10.5.13.144'
+            # IP Hamburg
+            - 'ip 10.5.13.142'
+            # Pixelpark Admin-Netz
+            -  '217.66.51.'
           enforce: all
       - location2:
         provider: location
-        path: '/my-test2'
+        path: '/api/v1/cdm-ham/notification-handler'
         auth_type: Basic
         auth_name: "Restricted Content"
         auth_user_file: '/etc/httpd/conf/basic-auth-hh'
         require:
           requires:
             - 'user hh-push'
-            - 'ip 10.5.13.142 217.66.51.248 192.168.66.253 192.168.66.254 10.99.1.10'
+            # IP Hamburg
+            - 'ip 10.5.13.142'
+            # Pixelpark Admin-Netz
+            -  '217.66.51.'
           enforce: all

diff --git a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
index f436a29c467ebe5cb88cc65a45ec2516a34a4966..6ac0513cc12043bbdadf93e9e7fae12922d5bb2b 100644 (file)
--- a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
@@ -48,23 +48,29 @@ infra::profile::apache::pp_vhosts:
         directoryindex: index.php index.html
       - location1:
         provider: location
-        path: '/my-test1'
+        path: '/api/v1/cdm-ham/system-status-handler'
         auth_type: Basic
         auth_name: "Restricted Content"
         auth_user_file: '/etc/httpd/conf/basic-auth-hh'
         require:
           requires:
             - 'user hh-push'
-            - 'ip 10.5.13.142 10.5.13.144'
+            # IP Hamburg
+            - 'ip 10.5.13.142'
+            # Pixelpark Admin-Netz
+            -  '217.66.51.'
           enforce: all
       - location2:
         provider: location
-        path: '/my-test2'
+        path: '/api/v1/cdm-ham/notification-handler'
         auth_type: Basic
         auth_name: "Restricted Content"
         auth_user_file: '/etc/httpd/conf/basic-auth-hh'
         require:
           requires:
             - 'user hh-push'
-            - 'ip 10.5.13.142 217.66.51.248 192.168.66.253 192.168.66.254 10.99.1.10'
+            # IP Hamburg
+            - 'ip 10.5.13.142'
+            # Pixelpark Admin-Netz
+            -  '217.66.51.'
           enforce: all