added ssl again on tst-fbb-api because of LB

diff --git a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
index 9e93e976a5c2a418a5f06808d20681e3df5eb486..dd867fd7d4aeb216d5e3394fdc55ef480808eeda 100644 (file)
--- a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
@@ -20,11 +20,11 @@ infra::profile::apache::pp_vhosts:
     servername: tst-api-fbb.pixelpark.net
     serveraliases:
       - tst-api01-fbb.pixelpark.net
-#    cert_servername: 'wildcard.pixelpark.net'
-#    cert_customer: 'pixelpark'
-#    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-#    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-#    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'
+    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
+    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
+    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '2775'
@@ -63,10 +63,10 @@ infra::profile::apache::pp_vhosts:
       - '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://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]'
+    rewrites:
+      - alias:
+        comment: 'Alles auf https umleiten'
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTPS} !=on'
+        rewrite_rule:
+          - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [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 7b350df2bfb813a800cb4ecc2fcc840f9f7fb9cb..b2541d742d0aff949ddf15077f52932a49e6cf20 100644 (file)
--- a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
@@ -13,11 +13,11 @@ infra::profile::apache::pp_vhosts:
     servername: tst-api-fbb.pixelpark.net
     serveraliases:
       - tst-api02-fbb.pixelpark.net
-#    cert_servername: 'wildcard.pixelpark.net'
-#    cert_customer: 'pixelpark'
-#    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-#    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-#    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'
+    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
+    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
+    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '2775'
@@ -56,10 +56,10 @@ infra::profile::apache::pp_vhosts:
       - '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://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]'
+    rewrites:
+      - alias:
+        comment: 'Alles auf https umleiten'
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTPS} !=on'
+        rewrite_rule:
+          - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]'