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

Added checks for domain variable in apache module

Browse source
This commit is contained in:
Ossi Salmi 2010-11-08 14:26:34 +02:00 • committed by Timo Mkinen
parent 45b597c29c
commit dddba9202f
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,11 @@
<% if has_variable?("domain") -%>
# #
# ServerAdmin: Your address, where problems with the server should be # ServerAdmin: Your address, where problems with the server should be
# e-mailed. This address appears on some server-generated pages, such # e-mailed. This address appears on some server-generated pages, such
# as error documents. e.g. admin@your-domain.com # as error documents. e.g. admin@your-domain.com
# #
ServerAdmin adm@<%= domain %> ServerAdmin adm@<%= domain %>
<% end -%>
# #
# ServerName gives the name and port that the server uses to identify itself. # ServerName gives the name and port that the server uses to identify itself.

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

@ -245,12 +245,14 @@ Group <%= httpd_group %>
# virtual host being defined. # virtual host being defined.
# #
<% if has_variable?("domain") -%>
# #
# ServerAdmin: Your address, where problems with the server should be # ServerAdmin: Your address, where problems with the server should be
# e-mailed. This address appears on some server-generated pages, such # e-mailed. This address appears on some server-generated pages, such
# as error documents. e.g. admin@your-domain.com # as error documents. e.g. admin@your-domain.com
# #
ServerAdmin adm@<%= domain %> ServerAdmin adm@<%= domain %>
<% end -%>
# #
# ServerName gives the name and port that the server uses to identify itself. # ServerName gives the name and port that the server uses to identify itself.

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

@ -245,12 +245,14 @@ Group <%= httpsd_group %>
# virtual host being defined. # virtual host being defined.
# #
<% if has_variable?("domain") -%>
# #
# ServerAdmin: Your address, where problems with the server should be # ServerAdmin: Your address, where problems with the server should be
# e-mailed. This address appears on some server-generated pages, such # e-mailed. This address appears on some server-generated pages, such
# as error documents. e.g. admin@your-domain.com # as error documents. e.g. admin@your-domain.com
# #
ServerAdmin adm@<%= domain %> ServerAdmin adm@<%= domain %>
<% end -%>
# #
# ServerName gives the name and port that the server uses to identify itself. # ServerName gives the name and port that the server uses to identify itself.