removed htaccess on tst-fbb-api temp - revert

diff --git a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
index d9b37816a8aac9e07f0bcb0e25ead401f6801a4b..e25480a4d2fbb68bb7446ab822170acb9c0849bd 100644 (file)
--- a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
@@ -55,38 +55,25 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - All
         directoryindex: index.php index.html
-#      - 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'
-
-#        auth_type: Basic
-#        auth_name: server
-#        auth_user_file: '/var/www/.htaccess_fbb_api'
-#        require:
-#          requires:
-#            - 'user hh-push'
-#            - 'ip 10.5.13.142 10.5.13.144'
-#          enforce: all
-#      - 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'
-  ########
-  #      auth_type: Basic
-  #      auth_name: server
-  #      auth_user_file: '/var/www/.htaccess_fbb_api'
-  #      require:
-  #        requires:
-  #          - 'user hh-push'
-  #          - 'ip 10.5.13.142 10.5.13.144'
-  #        enforce: all
+      - location1:
+        provider: location
+        path: '/api/v1/cdm-ham/system-status-handler'
+        auth_type: Basic
+        auth_name: server
+        auth_user_file: '/var/www/.htaccess_fbb_api'
+        require:
+          requires:
+            - 'user hh-push'
+            - 'ip 10.5.13.142 10.5.13.144'
+          enforce: all
+      - location2:
+        provider: location
+        path: '/api/v1/cdm-ham/notification-handler'
+        auth_type: Basic
+        auth_name: server
+        auth_user_file: '/var/www/.htaccess_fbb_api'
+        require:
+          requires:
+            - 'user hh-push'
+            - 'ip 10.5.13.142 10.5.13.144'
+          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 8ffb14b738f420ad8e3083bd7dffaca21ffad92f..b50ab2c6e9f89825f4cd4b71d6f713e15fd179dc 100644 (file)
--- a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
@@ -46,35 +46,35 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - All
         directoryindex: index.php index.html
-#      - location1:
-#        provider: location
-#        path: '/api/v1/cdm-ham/system-status-handler'
+      - 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'
-#        auth_type: Basic
-#        auth_name: server
-#        auth_user_file: '/var/www/.htaccess_fbb_api'
-#        require:
-#          requires:
-#            - 'user hh-push'
-#            - 'ip 10.5.13.142 10.5.13.144'
-#          enforce: all
-#      - location2:
-#        provider: location
-#        path: '/api/v1/cdm-ham/notification-handler'
+        auth_type: Basic
+        auth_name: server
+        auth_user_file: '/var/www/.htaccess_fbb_api'
+        require:
+          requires:
+            - 'user hh-push'
+            - 'ip 10.5.13.142 10.5.13.144'
+          enforce: all
+      - 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'
-#        auth_type: Basic
-#        auth_name: server
-#        auth_user_file: '/var/www/.htaccess_fbb_api'
-#        require:
-#          requires:
-#            - 'user hh-push'
-#            - 'ip 10.5.13.142 10.5.13.144'
-#          enforce: all
+        auth_type: Basic
+        auth_name: server
+        auth_user_file: '/var/www/.htaccess_fbb_api'
+        require:
+          requires:
+            - 'user hh-push'
+            - 'ip 10.5.13.142 10.5.13.144'
+          enforce: all