From: Thomas Dalichow <thomas.dalichow@publicispixelpark.de>
Date: Tue, 14 Aug 2018 09:04:14 +0000 (+0200)
Subject: fbb-api - Deactivating general HTTP-Auth, activate specific HTTP-Auth for TST + PRD... 
X-Git-Tag: v0.1.0~416
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=3ce7a3e7fd6c6649e1d9272c7ddc835d4e5e40f2;p=pixelpark%2Fhiera.git

fbb-api - Deactivating general HTTP-Auth, activate specific HTTP-Auth for TST + PRD - FBBPSCDM-95 (fix)
---

diff --git a/customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml b/customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml
index 383d3156..ef4c399e 100644
--- 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 4827389c..44fbdded 100644
--- 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 0ce65634..fe375c12 100644
--- 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 6ac0513c..af64e52e 100644
--- 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