From b1d6414ccacb537fe69a7adb660f75f29b43c94b Mon Sep 17 00:00:00 2001 From: Sascha Date: Fri, 3 Aug 2018 14:15:22 +0200 Subject: [PATCH] tst fbb api basic auth - mfkuw custom frag. --- .../fbb-api/tst-api01-fbb.pixelpark.net.yaml | 42 +++++++++++-------- .../fbb-api/tst-api02-fbb.pixelpark.net.yaml | 24 +++++++---- ...litische-bildung-nrw-de.pixelpark.net.yaml | 2 +- 3 files changed, 41 insertions(+), 27 deletions(-) diff --git a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml index 40704e64..d6cc59a6 100644 --- a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml +++ b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml @@ -58,11 +58,14 @@ infra::profile::apache::pp_vhosts: - location1: provider: location path: '/api/v1/cdm-ham/system-status-handler' - auth_type: Digest +# 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_digest_provider: file - auth_digest_algorithm: MD5 - auth_user_file: '/etc/httpd/htdigest' + auth_user_file: '/etc/httpd/conf.d/.htaccess_fbb_api' require: requires: - 'user hh-push' @@ -71,25 +74,30 @@ infra::profile::apache::pp_vhosts: - location2: provider: location path: '/api/v1/cdm-ham/notification-handler' - auth_type: Digest + # 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_digest_provider: file - auth_digest_algorithm: MD5 - auth_user_file: '/etc/httpd/htdigest' + auth_user_file: '/etc/httpd/conf.d/.htaccess_fbb_api' require: requires: - 'user hh-push' - 'ip 10.5.13.142' enforce: all - setenv: - - 'DB_CONNECTION mysql' - - 'DB_HOST tst-db-fbb.pixelpark.net' - - 'DB_PORT 3306' - - 'DB_DATABASE api' - - 'DB_USERNAME api' - - 'DB_PASSWORD ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAB3Dp6iYPgTZEqyXn+o5yDZjdPa1pIwSzzsuBQwm6pUmlFv5NyorJhRrfqW+xkmPT2uHcV51kLPkOv80fiPkOXF6ODnKz7bUKZdf+HhF31hAzkuS92Hoe9d34ZVb+ZBr3WxkfBzy9HX5HAztA6Yc9tA9mrIgHUqbkbVcXf/z3X06YWfr8Xv+D4a+yoQcnclXhFSJh7MRSlAASrW+xu4Af9H14rL39lxdWsFwxq72XwrquisKdhXpeXaWLhnN+ct7Ss8FKLHxjF3mcHzkekBLiEK/jUA2u6wlDok657qw5FcgIw2YY+S5/RQz4WaYznomBbMhI/8526qxqUvVpyOYDFzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCju/IAgu5fiHjFJFrfTgTmgCD3/yahn/g6VBf4LzojcJDLNOGHzJU2zzQvaBlsSu1mbw==]' - - 'RABBITMQ_LOGIN fbb' - - 'RABBITMQ_PASSWORD ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXMzPcs/skt68fIg+hWyEs/9294IqB4cJTISW9zg+TGe9T7GFN4V/RtbNdi400s5WEf9l4qZy0Wn7254rDgIYuo8HNmU/PH9FFCjFwCuHz8XBz49E4NkR0811d30i3uS+flZjENTAYWnzRXD/Ut/1KRlpG7cdXX/GUySAtPK+khtii+RAkxMbDpIozNldjv0EMKBM3evf4+2BrLlwfwLdoL7h7+RKWK3EQX7Hr99GYUURF/KvzPDKhGVp39v17JZ+TU0wyVC+M8T/NrlB2nsS2mRu6ndOeXWsHRV9T57/fp4kNUd/xkWu/9ZCBVj7bwRcjjUFaBJ1KxsuwAXx2PgIGjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCufL9oPc4kLmUQZFl2y22CgCDWYICMquGHrKAOaZ+IQmhYeCTLpAyueZxm/Os1ss2ZAA==]' + + # disbaled because of ansible vault + # setenv: + # - 'DB_CONNECTION mysql' + # - 'DB_HOST tst-db-fbb.pixelpark.net' + # - 'DB_PORT 3306' + # - 'DB_DATABASE api' + # - 'DB_USERNAME api' + # - 'DB_PASSWORD ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAB3Dp6iYPgTZEqyXn+o5yDZjdPa1pIwSzzsuBQwm6pUmlFv5NyorJhRrfqW+xkmPT2uHcV51kLPkOv80fiPkOXF6ODnKz7bUKZdf+HhF31hAzkuS92Hoe9d34ZVb+ZBr3WxkfBzy9HX5HAztA6Yc9tA9mrIgHUqbkbVcXf/z3X06YWfr8Xv+D4a+yoQcnclXhFSJh7MRSlAASrW+xu4Af9H14rL39lxdWsFwxq72XwrquisKdhXpeXaWLhnN+ct7Ss8FKLHxjF3mcHzkekBLiEK/jUA2u6wlDok657qw5FcgIw2YY+S5/RQz4WaYznomBbMhI/8526qxqUvVpyOYDFzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCju/IAgu5fiHjFJFrfTgTmgCD3/yahn/g6VBf4LzojcJDLNOGHzJU2zzQvaBlsSu1mbw==]' + # - 'RABBITMQ_LOGIN fbb' + # - 'RABBITMQ_PASSWORD ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXMzPcs/skt68fIg+hWyEs/9294IqB4cJTISW9zg+TGe9T7GFN4V/RtbNdi400s5WEf9l4qZy0Wn7254rDgIYuo8HNmU/PH9FFCjFwCuHz8XBz49E4NkR0811d30i3uS+flZjENTAYWnzRXD/Ut/1KRlpG7cdXX/GUySAtPK+khtii+RAkxMbDpIozNldjv0EMKBM3evf4+2BrLlwfwLdoL7h7+RKWK3EQX7Hr99GYUURF/KvzPDKhGVp39v17JZ+TU0wyVC+M8T/NrlB2nsS2mRu6ndOeXWsHRV9T57/fp4kNUd/xkWu/9ZCBVj7bwRcjjUFaBJ1KxsuwAXx2PgIGjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCufL9oPc4kLmUQZFl2y22CgCDWYICMquGHrKAOaZ+IQmhYeCTLpAyueZxm/Os1ss2ZAA==]' # rewrites: # - alias: # comment: 'Alles auf https umleiten' diff --git a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml index 2aa85f2f..81edefe3 100644 --- a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml +++ b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml @@ -23,7 +23,7 @@ infra::profile::apache::pp_vhosts: serveraliases: - tst-api02-fbb.pixelpark.net - tst-api02-fbb.berlin-airport.de - - tst-api-fbb.berlin-airport.de + - tst-api-fbb.berlin-airport.de - tstcommercial-api02.berlin-airport.de - tstcommercial-api.berlin-airport.de cert_servername: 'wildcard.pixelpark.net' @@ -49,11 +49,14 @@ infra::profile::apache::pp_vhosts: - location1: provider: location path: '/api/v1/cdm-ham/system-status-handler' - auth_type: Digest +# 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_digest_provider: file - auth_digest_algorithm: MD5 - auth_user_file: '/etc/httpd/htdigest' + auth_user_file: '/etc/httpd/conf.d/.htaccess_fbb_api' require: requires: - 'user hh-push' @@ -62,11 +65,14 @@ infra::profile::apache::pp_vhosts: - location2: provider: location path: '/api/v1/cdm-ham/notification-handler' - auth_type: Digest + # 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_digest_provider: file - auth_digest_algorithm: MD5 - auth_user_file: '/etc/httpd/htdigest' + auth_user_file: '/etc/httpd/conf.d/.htaccess_fbb_api' require: requires: - 'user hh-push' diff --git a/customer/mfkuw-politische-bildung/dev-www-politische-bildung-nrw-de.pixelpark.net.yaml b/customer/mfkuw-politische-bildung/dev-www-politische-bildung-nrw-de.pixelpark.net.yaml index 55cd864e..be58c6a4 100644 --- a/customer/mfkuw-politische-bildung/dev-www-politische-bildung-nrw-de.pixelpark.net.yaml +++ b/customer/mfkuw-politische-bildung/dev-www-politische-bildung-nrw-de.pixelpark.net.yaml @@ -39,7 +39,7 @@ infra::profile::typo3::projects: custom_fragment: | XSendFile on XSendFilePath /var/www/www_politische-bildung_de - XSendFileIgnoreEtag on + XSendFileIgnoreEtag on directories: - location1: provider: location -- 2.39.5