From: Sascha Date: Fri, 3 Aug 2018 13:23:24 +0000 (+0200) Subject: tst fbb api hiera cleanup old crap X-Git-Tag: v0.1.0~452^2 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d0606ac401cd1bd595e90e3854e698ddd8d62054;p=pixelpark%2Fhiera.git tst fbb api hiera cleanup old crap --- diff --git a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml index 40312aca..14011662 100644 --- a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml +++ b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml @@ -87,21 +87,3 @@ infra::profile::apache::pp_vhosts: - 'user hh-push' - 'ip 10.5.13.142' enforce: all - - # 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' - # rewrite_cond: - # - '%%{ich-trickse}{HTTPS} !=on' - # rewrite_rule: - # - '(.*) https://tst-api-fbb.pixelpark.net/$1 [R=301,L]' diff --git a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml index ee7e45d1..b50754b1 100644 --- a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml +++ b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml @@ -78,19 +78,3 @@ infra::profile::apache::pp_vhosts: - '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==]' -# rewrites: -# - alias: -# comment: 'Alles auf https umleiten' -# rewrite_cond: -# - '%%{ich-trickse}{HTTPS} !=on' -# rewrite_rule: -# - '(.*) https://tst-api-fbb.pixelpark.net/$1 [R=301,L]'