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

Updated all templates to use instance variables

Browse source
This commit is contained in:
Ossi Salmi 2013-05-05 00:07:55 +03:00
parent a0c854d3c0
commit dc51af1ca2
113 changed files with 527 additions and 522 deletions
Download patch file Download diff file Expand all files Collapse all files

20
apache/templates/site.https.conf.erb
View file

@ -1,13 +1,13 @@
<VirtualHost <%= ipaddr %>:443>
<VirtualHost <%= @ipaddr %>:443>
# General setup for the virtual host, inherited from global configuration
DocumentRoot "/srv/www/https/<%= site_fqdn %>"
ServerName <%= site_fqdn %>:443
DocumentRoot "/srv/www/https/<%= @site_fqdn %>"
ServerName <%= @site_fqdn %>:443
# Use separate log files for the SSL virtual host; note that LogLevel
# is not inherited from httpd.conf.
ErrorLog /srv/www/log/https/<%= site_fqdn %>/error_log
CustomLog /srv/www/log/https/<%= site_fqdn %>/access_log combined
ErrorLog /srv/www/log/https/<%= @site_fqdn %>/error_log
CustomLog /srv/www/log/https/<%= @site_fqdn %>/access_log combined
LogLevel warn
# SSL Engine Switch:
@ -30,14 +30,14 @@ SSLCipherSuite RC4-SHA:HIGH:!ADH
# 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 <%= @apache_ssldir %>/certs/<%= site_fqdn %>.crt
SSLCertificateFile <%= @apache_ssldir %>/certs/<%= @site_fqdn %>.crt
# 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 <%= @apache_ssldir %>/private/<%= site_fqdn %>.key
SSLCertificateKeyFile <%= @apache_ssldir %>/private/<%= @site_fqdn %>.key
# Server Certificate Chain:
# Point SSLCertificateChainFile at a file containing the
@ -46,8 +46,8 @@ SSLCertificateKeyFile <%= @apache_ssldir %>/private/<%= site_fqdn %>.key
# the referenced file can be the same as SSLCertificateFile
# when the CA certificates are directly appended to the server
# certificate for convinience.
<% if ssl_chain != "" -%>
SSLCertificateChainFile <%= @apache_ssldir %>/certs/<%= site_fqdn %>.chain.crt
<% if @ssl_chain != "" -%>
SSLCertificateChainFile <%= @apache_ssldir %>/certs/<%= @site_fqdn %>.chain.crt
<% end -%>
# Certificate Authority (CA):
@ -149,6 +149,6 @@ BrowserMatch "MSIE [2-5]" \
#CustomLog logs/ssl_request_log \
# "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
Include <%= site_confdir %>/*.conf
Include <%= @site_confdir %>/*.conf
</VirtualHost>