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

16
apache/templates/httpsd.conf.erb
View file

@ -145,7 +145,7 @@ MaxRequestsPerChild 0
# Example:
# LoadModule foo_module modules/mod_foo.so
#
<% if operatingsystem == 'Fedora' and operatingsystemrelease.to_i > 17 -%>
<% if @operatingsystem == 'Fedora' and @operatingsystemrelease.to_i > 17 -%>
Include conf.modules.d/*.conf
<% else -%>
LoadModule auth_basic_module modules/mod_auth_basic.so
@ -196,7 +196,7 @@ LoadModule proxy_connect_module modules/mod_proxy_connect.so
LoadModule cache_module modules/mod_cache.so
LoadModule suexec_module modules/mod_suexec.so
LoadModule disk_cache_module modules/mod_disk_cache.so
<% if ['CentOS','RedHat'].index(operatingsystem) and operatingsystemrelease =~ /^[1-5]\./ -%>
<% if ['CentOS','RedHat'].index(@operatingsystem) and @operatingsystemrelease =~ /^[1-5]\./ -%>
LoadModule file_cache_module modules/mod_file_cache.so
LoadModule mem_cache_module modules/mod_mem_cache.so
<% end -%>
@ -249,13 +249,13 @@ Group <%= scope.lookupvar('apache::sslserver::group') %>
# virtual host being defined.
#
<% if has_variable?("domain") -%>
<% if @domain -%>
#
# ServerAdmin: Your address, where problems with the server should be
# e-mailed. This address appears on some server-generated pages, such
# as error documents. e.g. admin@your-domain.com
#
ServerAdmin adm@<%= domain %>
ServerAdmin adm@<%= @domain %>
<% end -%>
#
@ -271,7 +271,7 @@ ServerAdmin adm@<%= domain %>
# redirections work in a sensible way.
#
#ServerName www.example.com:80
ServerName <%= homename %>
ServerName <%= @homename %>
#
# UseCanonicalName: Determines how Apache constructs self-referencing
@ -287,7 +287,7 @@ UseCanonicalName Off
# documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations.
#
DocumentRoot "/srv/www/https/<%= homename %>"
DocumentRoot "/srv/www/https/<%= @homename %>"
#
# Each directory to which Apache has access can be configured with respect
@ -480,7 +480,7 @@ HostnameLookups Off
# logged here. If you *do* define an error logfile for a <VirtualHost>
# container, that host's errors will be logged there and not here.
#
ErrorLog /srv/www/log/https/<%= homename %>/error_log
ErrorLog /srv/www/log/https/<%= @homename %>/error_log
#
# LogLevel: Control the number of messages logged to the error_log.
@ -522,7 +522,7 @@ LogFormat "%{User-agent}i" agent
# For a single logfile with access, agent, and referer information
# (Combined Logfile Format), use the following directive:
#
CustomLog /srv/www/log/https/<%= homename %>/access_log combined
CustomLog /srv/www/log/https/<%= @homename %>/access_log combined
#
# Optionally add a line containing the server version and virtual host