From 4cf9d97fc8b27ece4ad309a031932c81dbfef29e Mon Sep 17 00:00:00 2001 From: Andreas Gerstenberg Date: Fri, 17 Jun 2016 08:41:35 +0200 Subject: [PATCH] zf - added ssl for dialogrunde-brustkrebs.dedialogrunde-brustkrebs.de --- customer/pfizer/web01-pfizer-de.pixelpark.net.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/customer/pfizer/web01-pfizer-de.pixelpark.net.yaml b/customer/pfizer/web01-pfizer-de.pixelpark.net.yaml index 32b438cd..be8ab352 100644 --- a/customer/pfizer/web01-pfizer-de.pixelpark.net.yaml +++ b/customer/pfizer/web01-pfizer-de.pixelpark.net.yaml @@ -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 -- 2.39.5