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

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

@ -1,10 +1,10 @@
<% 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 -%>
#
@ -19,7 +19,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 <%= homename %>
ServerName <%= @homename %>
#
# UseCanonicalName: Determines how Apache constructs self-referencing