diff options
| author | varac <varacanero@zeromail.org> | 2013-09-19 13:48:07 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-19 13:48:07 +0200 |
| commit | 55578fec453d6b090f623fd3368138f9e322c9f5 (patch) | |
| tree | 65e4198f804fe82c364ed6ae2df058361e769677 /puppet | |
| parent | 43a5b322d99effa411c9fddf5f849da70a7768e8 (diff) | |
tidy webapp api x509 definitions (#3840)
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/modules/site_apache/templates/vhosts.d/api.conf.erb | 6 |
1 files changed, 3 insertions, 3 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 bc5ff156..4efbbc52 100644 --- a/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb +++ b/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb @@ -15,9 +15,9 @@ Listen 0.0.0.0:<%= api_port %> SSLHonorCipherOrder on SSLCACertificatePath /etc/ssl/certs - SSLCertificateChainFile /etc/ssl/certs/leap_api.pem - SSLCertificateKeyFile /etc/x509/keys/leap_api.key - SSLCertificateFile /etc/x509/certs/leap_api.crt + SSLCertificateChainFile <%= scope.lookupvar('x509::variables::local_CAs') %>/<%= scope.lookupvar('site_config::params::ca_name') %>.crt + SSLCertificateKeyFile <%= scope.lookupvar('x509::variables::keys') %>/<%= scope.lookupvar('site_config::params::cert_name') %>.key + SSLCertificateFile <%= scope.lookupvar('x509::variables::certs') %>/<%= scope.lookupvar('site_config::params::cert_name') %>.crt RequestHeader set X_FORWARDED_PROTO 'https' |