From: Thomas Dalichow <thomas.dalichow@publicispixelpark.de>
Date: Thu, 2 Aug 2018 12:41:57 +0000 (+0200)
Subject: fbb-api  - modify HTTP auth, see FBBPSCDM-95
X-Git-Tag: v0.1.0~452^2~7
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=83a2f4da72abe47455baa40d257a0e65ccfc70df;p=pixelpark%2Fhiera.git

fbb-api  - modify HTTP auth, see FBBPSCDM-95
---

diff --git a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
index 1edf5b52..67107c98 100644
--- a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
@@ -5,6 +5,7 @@ infra::additional_classes:
 infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAi7B5vSvLZSBDcOlVym8Mn0yOKPvW6EG9cNIihJTLNYTTuT4zNIKrrYqfacgpjwqsWuu18dNfneh8wZRaf9/QccZ+HIYTV7a/0tKJLcGhE+5Ltm1OJ+CBrB/mVoz1YVWS6OTQoK0gsTMLYlH5psvdpuWVkwudV1b56WCa/TL5iJqy3V+A5hbQjlQVcG2A6HHz1vyPh6gxAg6we6bc43Nmxw8cPDG+Am5H+i97b+/BVagd2pTNJu1341p7WhXcnKiRzKfHUj2YoxB2hxm1Jr9gyZoJOJP0h4o5oP1D9hUkdUiwu8TF0KPY6K7FjWN/EXX3EYqAOjm8CXJCjqmch0ajDTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAbSXchRvjLyzx3FxAqhXSVgBDnaVLim4RWrpZgLQJhA0ea]
+    hh-push: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAM0A+hkRqCY23WzNVvQzLTzScIGuWDiHekjphSe4dNOscIZ11uBOMgjgvFd0QYMXrt3LC8OwDf4q9tkqPGZOucfbOkAn6C3HWgUlpFVPaJuRay9QC0r2Lsqsf6Id9IMxwHx2T6P2DCCOadVMLZurpOWuAKcBeCvlGwwl81bP03olVNfp5tf7ZdQUQAaWw9vt/DAvectou6lhfZLG/FWQJGYwR/ylusEQvw+NbOmiLc7kyXZlzcoJR5ltPbOaEv6rUGCpYdFs+Ihyfq6eMae7Z/vt9IGRWlNwbIQlCGNXRfGOOiL0usNEgKFiLyNFv5Thg1TlGllwN3i/omOP5bBcBLDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA8i0dbTd4aXiBcz3QmAxIGgBDvWpSqQ2VIqXFpwXd3BdOb]
 
 redis::bind: 0.0.0.0
 redis::manage_repo: true
@@ -54,20 +55,32 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - All
         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'
-#        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
+      - location1:
+        provider: location
+        path: '/api/v1/cdm-ham/system-status-handler'
+        auth_type: Digest
+        auth_name: server
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        require:
+          requires:
+            - 'user hh-push'
+#            - 'ip 10.5.13.142'
+          enforce: any
+      - location2:
+        provider: location
+        path: '/api/v1/cdm-ham/notification-handler'
+        auth_type: Digest
+        auth_name: server
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        require:
+          requires:
+            - 'user hh-push'
+#            - 'ip 10.5.13.142'
+          enforce: any
     setenv:
       - 'DB_CONNECTION mysql'
       - 'DB_HOST tst-db-fbb.pixelpark.net'
diff --git a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
index e92b9212..5b8e0629 100644
--- a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
@@ -46,20 +46,32 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - All
         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'
-#        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
+      - location1:
+        provider: location
+        path: '/api/v1/cdm-ham/system-status-handler'
+        auth_type: Digest
+        auth_name: server
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        require:
+          requires:
+            - 'user hh-push'
+#            - 'ip 10.5.13.142'
+          enforce: any
+      - location2:
+        provider: location
+        path: '/api/v1/cdm-ham/notification-handler'
+        auth_type: Digest
+        auth_name: server
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        require:
+          requires:
+            - 'user hh-push'
+#            - 'ip 10.5.13.142'
+          enforce: any
     setenv:
       - 'DB_CONNECTION mysql'
       - 'DB_HOST tst-db-fbb.pixelpark.net'