From: Thomas Heller <thomas.heller@pixelpark.com>
Date: Thu, 27 Oct 2016 11:09:06 +0000 (+0200)
Subject: bmf-DC - config changes
X-Git-Tag: v0.1.0~3896^2
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=6b6bcec13c110d20d7aa706e56f683be0a7104e5;p=pixelpark%2Fhiera.git

bmf-DC - config changes
---

diff --git a/customer/bmf-datacenter/production.yaml b/customer/bmf-datacenter/production.yaml
index 23c57e1d..ecf5b32d 100644
--- a/customer/bmf-datacenter/production.yaml
+++ b/customer/bmf-datacenter/production.yaml
@@ -1,7 +1,6 @@
 ---
-
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAlqDjWFeAE2fK20zFd4HSrodrA+qdhy65aijBSyvBYeFNLAjXlH+1X/WaZN93Dj/oMtyE8lre7Oh/LAuCrkMFcfPyWq5LrehSkdTbTEKnyHcqR8iGa1Z0oIzqqLqjfdLrgr4lauoFPWlX2eJCskBhUORREH9uKHsjRRFC44V40s7D2c/+H8aJ956NZpQbDL9qyVfMyI7Xx7kP7MPVqlHAzF8l2FYePEOKBWyLDas56OSsxJsFgUnwR3tHFwBqwj0RXAGPWmPtjdf9YWnHAE2nTdt9yjtBjF3E6GUvaXt0lwryt71reZpsMkRVnrnOtRKzqCyY6XWRMIUZztL16wmlhjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBeu41/cnhuXv30JTEjB27xgCDxBJ+C3Gnne7LrEysWxg6ZrEROcni9PYZrnR/9p8ALCQ==]
-mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAX7+wynkQ5tL+ep7vhU/Ysrae+ttmWMVVMGCPh+L75Zk2RVT6u1aM+mGty4RIBDvVI0WWACUKDrnLMwYrEBS8haMFg3WWoPfvnUqhQI09wdXvigjZU801EG1HmM43+T11mEBf/8QaVbW8xdeWSgKgWgjRe6kM7I5APfi9v/9loBAOpE90JaVABpIAChcHtJA127sB5DYApmX5remF0xWzoQqA+UNNojfDUY/6uYwdOt98c/9WcgkDMyDnySCV6GOjJYaW4/4JWVAc9T1VfnaP4/7pVDydxrZZh+D6OgQ9xBvqEPWnXMg3ixL/PEAIVRDQtDF+nbRQ8GPOF4c9VOcfnDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBhgO792Ove/xa5lf/q2uKHgCAfoLGyHstZB3/z8CUIECxaZC+VpYaBpBeT+0rjQSJTvA==]
+mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASQmvSrhtOF0VCMiPEhzL+ohB0FalIuN1DrxFu6cpYbxf/MFK7ayf2tumFWs7lX87vROKPGhH5dbmCTq+3nqzCCpRjaa4fomZ9ukDd7omtjp47FUoWcsDfUyx4LVpEJXEz2/MCG6NiiqCTlk1JGwIlXbWIJRriIrpmAgGnX6Ogbf0pYixVTdlNBCpyR3Em2W5gjb0u9D1kOq0oHc0MydpKHv1kPv3lz6PL5QjkfgChRqvP5bNO+Cbv4dwD2xm7pWnKovTFwtUD5mEzIXuYxpGTN1/O7KqCnUsdBMq1GEvNfgrKq5+of2MUlBOmcagUKF8bOms+x6cfjSQZJ9i3tj5kTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCbkLAZAGum47dL99ZgqPlYgCC9tm8zgvC3pB/sqLWz5+sCS9YdKXDmzmyOjQiqF6ZRfQ==]
 mysql::server::backup::backupdir: '/var/backup/mysql'
 site::profile::mysql_server::databases:
   bundeshaushalt:
@@ -41,10 +40,6 @@ php::cli::settings:
   PHP/memory_limit: 512M
   PHP/max_execution_time: '0'
 
-site::profile::apache::htdigest:
-  server:
-    www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEArGsd8jo1aMkcLYmh0STJoh6zCICfwUCP+v56RikVVymWch8NztOGdPSIK0vYLbLaiky5XKNt3eatbxtlKfJi7ar8sxuhWewHdl4nGRGp97nmAp4iLse+EJkW5s2zoE3Fam4R5VSgZNUZyyf2KRJN2FKMgfukFfNXhKrwvK9tQNDTS7cbS0FsbAlf69J3ExK/v+wH/KkeNNZotVJncl71PJHriqR6/NkHA8zhT+6YCVEGbOW+YLzdIb/9CTm/jQjhbZ+fkHcChlHyraiZj83vHICi/+Pud66e63IAzBZIyXh2HI68losiGvLJ6pjS/mmBwNvzGwfUAXx0odRXwW78VzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDChe5YmV3+3ANU2B6Q34pkgCBfu2Aubb+CmXqzpzjNWAetRux2suldVCwUIdr55hMoTg==]
-
 site::profile::typo3::projects:
   bundeshaushalt:
     version: '7.6.11'
@@ -143,14 +138,11 @@ site::profile::wordpress::projects:
           - '^(.*)$ http://www.so-klingt-europa.de/en$1 [L,R=301]'
       - alias:
         comment: 'Weiterleitung /anmeldung'
-#
-#        rewrite_rule:
+#       rewrite_rule:
 #          - '^/anmeldung$ https://registration.bundesfinanzministerium.de/eventview/?p=zbb011b8fee0f0ebfc84485d584922b66$1 [NC,L,R=301]'
-#
 # JIRA (BMFSUP-881)
         rewrite_rule:
           - '^/anmeldung$ / [NC,L,R=302]'
-
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
diff --git a/customer/bmf-datacenter/test.yaml b/customer/bmf-datacenter/test.yaml
index 6de149ea..6615c4f4 100644
--- a/customer/bmf-datacenter/test.yaml
+++ b/customer/bmf-datacenter/test.yaml
@@ -1,6 +1,6 @@
 ---
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhANiKciHcmZldGrwiQg9WZthD0SbElB4IFXB4c97hPV2pQCYi6AyuI5Y/FqEuc9IbO0q7ULbSaebxV1wi+fuhEivpa76yEXeWb6FsM3oArNGQ0wfK4B9Nb1RInpY3NGU2Xe2Qj9ge725kmaB0lqK6QPKD7FJFmn7QkhH7Y2AAEN+G677fuu6MpD0PizdfC7BftmbJT/XWs6rbh6tvYHaZiIuuJJPRsms8nBxUVm0J2XxT7K5o3mXyqA+TNNOqoljLTXRmqFup4/gdkJBFepmtEDFcfh+Y6K7YpoVBxBVyw+Fvgm27PoQEmeYWIe4OX6rGr6Ex/jNFcFgQ/Z+hB+svzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB+sQ1miUyAv6JfaUhMU78ugCCqjlkfy5JP66NJXlIV6OIA3oydvUY1FCtHBlKesFJ2FA==]
-mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJXYG2OisiQFoiHsGKF7wmHu+GVeENZLzi7F7vprhCLAYbWHdUhHFXi9Ao6yy4Gnww/pxLg9C8eVCERlFzWjBcx6OIXGwidAfNZNagmI6lEtpMZ0NXfDGUXvMqqQgAPj8AQGuT31J1Hyk0nVitJyvw6hIQ3y0xwNk7sIz3ty2drBzb+Bm3IzY+FYQ0HuLOOn5YWOpOVPjC/Cr2jQuZe5DbNQZCvsf5AYNl/SLsFTXZ0BzI70xolrQUxe/7IsqXaiDgWtNzcjh7t12WCFjblvsqj9dDVoVap0ohxBAgi9vGLz0I5EeJ7avC9OElkU74+0Da2XZLSuW2OCCfOm1dIYg5DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAf8iCFEczgni5xmU2/PjZjgCBvMhwjSWmW4HEwvfiF/RgMeZM80KStgAuEQ6X1a9g9bw==]
+mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJ66BCicoWj4g+rcZnaC8G0hb3gMxkZdDHTP5K9gB7AZSOl5ftgRsgJilmNKXnHy5YfJvODZsF3e0bDBgPi3qVPSOP4eYB9nLrJJHb33NE3aawU61Tx4C3kMt93wi/QdMKgiHSAXKRWIfOffw1n9we1MfCLJIHxvw0g7zDyPxiBYMcMJ5TCmz1rYXIncY4fKkCs0vx92H1lNe9RtVGF9k39UvRV4wMCT21pfub4sLTjdv8m7U3avRu91xAYejh8QeW7PLWf9MI4R/a8PM67etBnikcVOdB0vl20BFHn+9J4NK1vQRHko1AQM5ujl9id60uCUBtCGb1M1bYK6dT+GKnjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDIVi0P6/QCn6ME7OneXlwRgCCAvraBQ+vOAgwCFizNxtYwVgYuh2o5RFx94nsMgOAsnA==]
 site::profile::mysql_server::databases:
   bundeshaushalt:
     user: datacenter
diff --git a/customer/bmf-europa/web-so-klingt-europa-de.pixelpark.net.yaml b/customer/bmf-europa/web-so-klingt-europa-de.pixelpark.net.yaml
index 20f72381..0dcaa544 100644
--- a/customer/bmf-europa/web-so-klingt-europa-de.pixelpark.net.yaml
+++ b/customer/bmf-europa/web-so-klingt-europa-de.pixelpark.net.yaml
@@ -38,7 +38,8 @@ site::profile::wordpress::projects:
       - alias:
         comment: 'Weiterleitung /anmeldung'
         rewrite_rule:
-          - '^/anmeldung$ https://registration.bundesfinanzministerium.de/eventview/?p=zbb011b8fee0f0ebfc84485d584922b66$1 [NC,L,R=301]'
+#BMFSUP-881- '^/anmeldung$ https://registration.bundesfinanzministerium.de/eventview/?p=zbb011b8fee0f0ebfc84485d584922b66$1 [NC,L,R=301]'
+           - '^/anmeldung$ / [NC,L,R=302]'
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'