tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced fqdn variables with homename

Browse source
This commit is contained in:
Ossi Salmi 2010-11-08 14:16:04 +02:00 • committed by Timo Mkinen
parent c871e91a13
commit 45b597c29c
12 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
puppet/templates/puppet-httpd.conf.erb
View file

@ -26,8 +26,8 @@ Listen 8140
# Use separate log files for the SSL virtual host; note that LogLevel
# is not inherited from httpd.conf.
ErrorLog /srv/www/log/https/<%= fqdn %>/error_log
CustomLog /srv/www/log/https/<%= fqdn %>/access_log combined
ErrorLog /srv/www/log/https/<%= homename %>/error_log
CustomLog /srv/www/log/https/<%= homename %>/access_log combined
LogLevel warn
# SSL Engine Switch:
@ -44,14 +44,14 @@ SSLCipherSuite SSLv2:-LOW:-EXPORT:RC4+RSA
# the certificate is encrypted, then you will be prompted for a
# pass phrase. Note that a kill -HUP will prompt again. A new
# certificate can be generated using the genkey(1) command.
SSLCertificateFile <%= puppet_ssldir %>/certs/<%= fqdn %>.pem
SSLCertificateFile <%= puppet_ssldir %>/certs/<%= homename %>.pem
# Server Private Key:
# If the key is not combined with the certificate, use this
# directive to point at the key file. Keep in mind that if
# you've both a RSA and a DSA private key you can configure
# both in parallel (to also allow the use of DSA ciphers, etc.)
SSLCertificateKeyFile <%= puppet_ssldir %>/private_keys/<%= fqdn %>.pem
SSLCertificateKeyFile <%= puppet_ssldir %>/private_keys/<%= homename %>.pem
# Server Certificate Chain:
# Point SSLCertificateChainFile at a file containing the