summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-02-07 16:52:27 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-02-07 16:52:27 -0200
commit5ade2be9470c0e4292979535a217c3c477d93237 (patch)
tree5d505c9ad698b96df094544294087e847ab5b11e /templates
parent13859194594db5744696b5ce03847584f8065285 (diff)
downloadpuppet-apache-5ade2be9470c0e4292979535a217c3c477d93237.tar.gz
puppet-apache-5ade2be9470c0e4292979535a217c3c477d93237.tar.bz2
Using just $hostname for $apache_server_name
Diffstat (limited to 'templates')
-rw-r--r--templates/apache2.conf.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/apache2.conf.erb b/templates/apache2.conf.erb
index cc59c6d..ee28bdc 100644
--- a/templates/apache2.conf.erb
+++ b/templates/apache2.conf.erb
@@ -35,7 +35,7 @@
# such as the number of concurrent requests it can handle or where it
# can find its configuration files.
#
-ServerName <%= apache_server_name %>
+ServerName <%= apache_server_name %>.<%= domain %>
#
# ServerRoot: The top of the directory tree under which the server's