From: Andreas Gerstenberg <gerstenberg@dhcp-admin-217-66-51-234.pixelpark.com>
Date: Tue, 1 Mar 2016 08:09:10 +0000 (+0100)
Subject: added new ssl certs
X-Git-Tag: v0.1.0~5277
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=35b7077b95f4ab62d892c7338c4347c93abb0bae;p=pixelpark%2Fhiera.git

added new ssl certs
---

diff --git a/customer/bmbf/production.yaml b/customer/bmbf/production.yaml
index c47df351..c1204cf2 100644
--- a/customer/bmbf/production.yaml
+++ b/customer/bmbf/production.yaml
@@ -41,9 +41,9 @@ site::profile::typo3::projects:
     serveraliases:
       - wissenschaftsjahr.de
       - www-wissenschaftsjahr-de.pixelpark.net
-    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'
+    ssl_cert: '/etc/pki/tls/certs/www.wissenschaftsjahr.de-cert.pem'
+    ssl_key: '/etc/pki/tls/private/www.wissenschaftsjahr.de-key.pem'
+    ssl_chain: '/etc/pki/tls/certs/www.wissenschaftsjahr.de-cert.pem'
     directories:
       - location1:
         provider: location
@@ -56,10 +56,10 @@ site::profile::typo3::projects:
         auth_require: 'valid-user'
         require:
           - local
-#    rewrites_no_ssl: 
+#    rewrites_no_ssl:
 #      - https:
 #        comment: 'all to https'
-#        rewrite_rule: 
+#        rewrite_rule:
 #          - '^(.*)$ https://www.wissenschaftsjahr.de$1 [L,R=301]'
     user: service.typo3
     mode: '2775'
@@ -103,17 +103,17 @@ site::profile::typo3::projects:
       - location4:
         provider: location
         path: '/typo3/contrib/'
-    rewrites_no_ssl: 
+    rewrites_no_ssl:
       - stadtklang:
         comment: 'Stadtklang auf Weiterleitung'
-        rewrite_cond: 
+        rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^www\.stadtklang2015\.de$ [NC,OR]'
           - '%%{ich-trickse}{HTTP_HOST} ^stadtklang2015\.de$ [NC]'
-        rewrite_rule: 
+        rewrite_rule:
           - '^(.*)$ https://www.wissenschaftsjahr-zukunftsstadt.de/stadtklang$1 [L,R=301]'
       - https:
         comment: 'all to https'
-        rewrite_rule: 
+        rewrite_rule:
           - '^(.*)$ https://www.wissenschaftsjahr-zukunftsstadt.de$1 [L,R=301]'
     rewrites_ssl:
       - experten1: