diff options
author | varac <varacanero@zeromail.org> | 2013-09-24 19:08:49 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2013-09-24 19:08:49 +0200 |
commit | 372c2f96997f90ae9bfd6c3315e7244ce851c460 (patch) | |
tree | 7e19f0933b3eb79c179142d4d6ff2eba24116aae /puppet/modules/site_apache/templates/vhosts.d | |
parent | d8b9ab39d333de6494e5006b3ba4abf4b8901bca (diff) | |
parent | abb03cd19389188c38ccaeb96e3136cac5397563 (diff) |
Merge branch 'feature/3916_Webapp_doesn_t_serve_commercial_cert' into develop
Diffstat (limited to 'puppet/modules/site_apache/templates/vhosts.d')
-rw-r--r-- | puppet/modules/site_apache/templates/vhosts.d/api.conf.erb | 3 | ||||
-rw-r--r-- | puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb index 9e2dbcaf..5f1f4c1d 100644 --- a/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb +++ b/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb @@ -7,8 +7,7 @@ Listen 0.0.0.0:<%= api_port %> <VirtualHost *:<%= api_port -%>> - ServerName <%= domain_name %> - ServerAlias <%= api_domain %> + ServerName <%= api_domain %> SSLEngine on SSLProtocol -all +SSLv3 +TLSv1 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' |