summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-24 19:08:49 +0200
committervarac <varacanero@zeromail.org>2013-09-24 19:08:49 +0200
commit372c2f96997f90ae9bfd6c3315e7244ce851c460 (patch)
tree7e19f0933b3eb79c179142d4d6ff2eba24116aae /puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb
parentd8b9ab39d333de6494e5006b3ba4abf4b8901bca (diff)
parentabb03cd19389188c38ccaeb96e3136cac5397563 (diff)
Merge branch 'feature/3916_Webapp_doesn_t_serve_commercial_cert' into develop
Diffstat (limited to 'puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb')
-rw-r--r--puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb6
1 files changed, 3 insertions, 3 deletions
diff --git a/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb
index 3b376839..6059453b 100644
--- a/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb
+++ b/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb
@@ -16,9 +16,9 @@
SSLHonorCipherOrder on
SSLCACertificatePath /etc/ssl/certs
- SSLCertificateChainFile /etc/ssl/certs/leap_webapp.pem
- SSLCertificateKeyFile /etc/x509/keys/leap_webapp.key
- SSLCertificateFile /etc/x509/certs/leap_webapp.crt
+ SSLCertificateChainFile <%= scope.lookupvar('x509::variables::local_CAs') %>/<%= scope.lookupvar('site_config::params::commercial_ca_name') %>.crt
+ SSLCertificateKeyFile <%= scope.lookupvar('x509::variables::keys') %>/<%= scope.lookupvar('site_config::params::commercial_cert_name') %>.key
+ SSLCertificateFile <%= scope.lookupvar('x509::variables::certs') %>/<%= scope.lookupvar('site_config::params::commercial_cert_name') %>.crt
RequestHeader set X_FORWARDED_PROTO 'https'