From bfca9e21239c02323666f6ebc2c897a586a7314b Mon Sep 17 00:00:00 2001 From: Sascha Date: Mon, 6 Aug 2018 11:32:26 +0200 Subject: [PATCH] removed htaccess on tst-fbb-api temp - revert --- .../fbb-api/tst-api01-fbb.pixelpark.net.yaml | 57 +++++++------------ .../fbb-api/tst-api02-fbb.pixelpark.net.yaml | 44 +++++++------- 2 files changed, 44 insertions(+), 57 deletions(-) diff --git a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml index d9b37816..e25480a4 100644 --- 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 8ffb14b7..b50ab2c6 100644 --- 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 -- 2.39.5