summaryrefslogtreecommitdiff
path: root/puppet/modules/site_nickserver/templates
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-19 13:45:03 +0200
committervarac <varacanero@zeromail.org>2013-09-19 13:45:03 +0200
commit43a5b322d99effa411c9fddf5f849da70a7768e8 (patch)
tree3e04903f3f1070f89e691d061888976ceccf766e /puppet/modules/site_nickserver/templates
parentb798d716e5219d00b5b94ce8b80566e4b3bf0899 (diff)
tidy nickserver x509 definitions (#3842)
Diffstat (limited to 'puppet/modules/site_nickserver/templates')
-rw-r--r--puppet/modules/site_nickserver/templates/nickserver-proxy.conf.erb6
1 files changed, 3 insertions, 3 deletions
diff --git a/puppet/modules/site_nickserver/templates/nickserver-proxy.conf.erb b/puppet/modules/site_nickserver/templates/nickserver-proxy.conf.erb
index 67896cd3..478ae7f1 100644
--- a/puppet/modules/site_nickserver/templates/nickserver-proxy.conf.erb
+++ b/puppet/modules/site_nickserver/templates/nickserver-proxy.conf.erb
@@ -14,9 +14,9 @@ Listen 0.0.0.0:<%= @nickserver_port -%>
SSLHonorCipherOrder on
SSLCACertificatePath /etc/ssl/certs
- SSLCertificateChainFile /etc/ssl/certs/nickserver.pem
- SSLCertificateKeyFile /etc/x509/keys/nickserver.key
- SSLCertificateFile /etc/x509/certs/nickserver.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
ProxyPass / http://localhost:<%= @nickserver_local_port %>/
ProxyPreserveHost On # preserve Host header in HTTP request