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

4
apache/templates/apache2.conf.erb
View file

@ -191,7 +191,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/http/<%= fqdn %>/error_log
ErrorLog /srv/www/log/http/<%= homename %>/error_log
#
# LogLevel: Control the number of messages logged to the error_log.
@ -223,7 +223,7 @@ LogFormat "%{User-agent}i" agent
#
# Define an access log for VirtualHosts that don't define their own logfile
CustomLog /srv/www/log/http/<%= fqdn %>/access_log combined
CustomLog /srv/www/log/http/<%= homename %>/access_log combined
# Include of directories ignores editors' and dpkg's backup files,

2
apache/templates/apache2.httpd.conf.erb
View file

@ -17,7 +17,7 @@ ServerAdmin adm@<%= domain %>
# You will have to access it by its address anyway, and this will make
# redirections work in a sensible way.
#
ServerName <%= fqdn %>
ServerName <%= homename %>
#
# UseCanonicalName: Determines how Apache constructs self-referencing

8
apache/templates/httpd.conf.erb
View file

@ -265,7 +265,7 @@ ServerAdmin adm@<%= domain %>
# redirections work in a sensible way.
#
#ServerName www.example.com:80
ServerName <%= fqdn %>
ServerName <%= homename %>
#
# UseCanonicalName: Determines how Apache constructs self-referencing
@ -281,7 +281,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/http/<%= fqdn %>"
DocumentRoot "/srv/www/http/<%= homename %>"
#
# Each directory to which Apache has access can be configured with respect
@ -474,7 +474,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/http/<%= fqdn %>/error_log
ErrorLog /srv/www/log/http/<%= homename %>/error_log
#
# LogLevel: Control the number of messages logged to the error_log.
@ -516,7 +516,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/http/<%= fqdn %>/access_log combined
CustomLog /srv/www/log/http/<%= homename %>/access_log combined
#
# Optionally add a line containing the server version and virtual host

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

@ -265,7 +265,7 @@ ServerAdmin adm@<%= domain %>
# redirections work in a sensible way.
#
#ServerName www.example.com:80
ServerName <%= fqdn %>
ServerName <%= homename %>
#
# UseCanonicalName: Determines how Apache constructs self-referencing
@ -281,7 +281,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/<%= fqdn %>"
DocumentRoot "/srv/www/https/<%= homename %>"
#
# Each directory to which Apache has access can be configured with respect
@ -474,7 +474,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/<%= fqdn %>/error_log
ErrorLog /srv/www/log/https/<%= homename %>/error_log
#
# LogLevel: Control the number of messages logged to the error_log.
@ -516,7 +516,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/<%= fqdn %>/access_log combined
CustomLog /srv/www/log/https/<%= homename %>/access_log combined
#
# Optionally add a line containing the server version and virtual host