]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
zf - added ssl for dialogrunde-brustkrebs.dedialogrunde-brustkrebs.de
authorAndreas Gerstenberg <gerstenberg@pixelpark.com>
Fri, 17 Jun 2016 06:41:35 +0000 (08:41 +0200)
committerAndreas Gerstenberg <gerstenberg@pixelpark.com>
Fri, 17 Jun 2016 06:41:44 +0000 (08:41 +0200)
customer/pfizer/web01-pfizer-de.pixelpark.net.yaml

index 32b438cdbbcb75b9eab2572d65e9ff954e2bbf12..be8ab3525868100016dce99f6304028f89bab2fb 100644 (file)
@@ -17,7 +17,7 @@ accounts::users:
     groups: apache
   thomas.bussmeyer:
     apply: true
-    sudo: false 
+    sudo: false
     groups: apache
   nikolai.potapov:
     apply: true
@@ -35,7 +35,7 @@ accounts::users:
     apply: true
     sudo: false
     groups: apache
-    
+
 # TODO: Abwarten auf Ticket: https://jira.pixelpark.com/jira/browse/PPPUPPET-202
 #  csv_upload:
 #    uid: 25113
@@ -1321,7 +1321,10 @@ site::profile::apache::vhosts:
 site::profile::apache::pp_vhosts:
   dialogrunde-blutkrebs:
     servername: www.dialogrunde-brustkrebs.de
-    ssl: false
+    ssl: true
+    ssl_cert: /etc/pki/tls/certs/www.pfizer.de-cert.pem.san
+    ssl_chain: /etc/pki/tls/certs/www.pfizer.de-cert.pem.san
+    ssl_key: /etc/pki/tls/private/www.pfizer.de-key.pem.san
     docroot: '/srv/www/dialogrunde-blutkrebs'
     serveraliases:
       - dialogrunde-brustkrebs.de
@@ -1343,10 +1346,10 @@ site::profile::apache::pp_vhosts:
     rewrites:
       - alias:
         comment: 'Alle Aliase auf Servername'
-        rewrite_cond: 
+        rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} !^www\.dialogrunde-brustkrebs\.de$ [NC]'
           - '%%{ich-trickse}{HTTP_HOST} !^www-dialogrunde-brustkrebs-de\.pixelpark\.net$ [NC]'
-        rewrite_rule: 
+        rewrite_rule:
           - '^(.*)$ http://www.dialogrunde-brustkrebs.de$1 [L,R=301]'
   our_default:
     servername: default