summaryrefslogtreecommitdiff
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
parent13859194594db5744696b5ce03847584f8065285 (diff)
downloadpuppet-apache-5ade2be9470c0e4292979535a217c3c477d93237.tar.gz
puppet-apache-5ade2be9470c0e4292979535a217c3c477d93237.tar.bz2
Using just $hostname for $apache_server_name
-rw-r--r--manifests/init.pp2
-rw-r--r--templates/apache2.conf.erb2
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 5ad7b16..f21a02d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -47,7 +47,7 @@ class apache {
}
case $apache_server_name {
- '': { $apache_server_name = $fqdn }
+ '': { $apache_server_name = $hostname }
}
package { "apache":
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