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 383d3156cb185e550d7f677b5de4b21b775a9611..ef4c399ec4175885c828a9e372dd2979eb9b916a 100644 (file)
--- a/customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml
@@ -50,7 +50,7 @@ infra::profile::apache::pp_vhosts:
             # IP Hamburg
             - 'ip 10.5.13.144'
             # Pixelpark Admin-Netz
-            -  '217.66.51.'
+            - 'ip 217.66.51.'
           enforce: all
       - location2:
         provider: location
@@ -64,5 +64,5 @@ infra::profile::apache::pp_vhosts:
             # IP Hamburg
             - 'ip 10.5.13.144'
             # Pixelpark Admin-Netz
-            -  '217.66.51.'
+            - 'ip 217.66.51.'
           enforce: all

diff --git a/customer/fbb-api/prd-api02-fbb.pixelpark.net.yaml b/customer/fbb-api/prd-api02-fbb.pixelpark.net.yaml
index 4827389c15431e7590767deaef31e9118da4c640..44fbdded7c73161ba5778a6b03fd197417314a50 100644 (file)
--- a/customer/fbb-api/prd-api02-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/prd-api02-fbb.pixelpark.net.yaml
@@ -39,17 +39,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
+            - 'ip 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
+            - 'ip 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 0ce65634837deb831d45b24d170fcee66b17a0e7..fe375c120bee2296a54b0b195de79f2a6b2ca237 100644 (file)
--- a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
@@ -65,7 +65,7 @@ infra::profile::apache::pp_vhosts:
             # IP Hamburg
             - 'ip 10.5.13.142'
             # Pixelpark Admin-Netz
-            -  '217.66.51.'
+            - 'ip 217.66.51.'
           enforce: all
       - location2:
         provider: location
@@ -79,5 +79,5 @@ infra::profile::apache::pp_vhosts:
             # IP Hamburg
             - 'ip 10.5.13.142'
             # Pixelpark Admin-Netz
-            -  '217.66.51.'
+            - 'ip 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 6ac0513cc12043bbdadf93e9e7fae12922d5bb2b..af64e52e5adda9639bacf084620019b85f974bcc 100644 (file)
--- a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
@@ -58,7 +58,7 @@ infra::profile::apache::pp_vhosts:
             # IP Hamburg
             - 'ip 10.5.13.142'
             # Pixelpark Admin-Netz
-            -  '217.66.51.'
+            - 'ip 217.66.51.'
           enforce: all
       - location2:
         provider: location
@@ -72,5 +72,5 @@ infra::profile::apache::pp_vhosts:
             # IP Hamburg
             - 'ip 10.5.13.142'
             # Pixelpark Admin-Netz
-            -  '217.66.51.'
+            - 'ip 217.66.51.'
           enforce: all