Using just $hostname for $apache_server_name

diff --git a/manifests/init.pp b/manifests/init.pp
index 5ad7b1611076f9429a69886b123299a8e5d75327..f21a02d77d46f976b2b911ccb130fa62eb11ff33 100644 (file)
--- 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 cc59c6d06f3634f1aa068946595ff782da99fab2..ee28bdc47ce3c9288daad2593b2f2ba5061b67f4 100644 (file)
--- 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