Introducing $apache_server_name

diff --git a/manifests/init.pp b/manifests/init.pp
index 8505d7ca6f6492281dc0ae86553012abf3dbeed0..f9c3a810dbf1893d1729f854df82fb3e8cdf266e 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -92,6 +92,10 @@ class apache {
     '': { $apache_error_dest = "${apache_error_folder}/index.html" }
   }
 
+  case $apache_server_name {
+    '': { $apache_server_name = $fqdn }
+  }
+
   define site($ensure = present, $docroot = false, $redirect = false,
               $redirect_match = false, $protocol = 'http',
               $server_alias = false, $use = false, $ticket = false,

diff --git a/templates/apache2.conf.erb b/templates/apache2.conf.erb
index 9ff6ea5c796fc68c0af832d5a4d4c0800255ebce..cc59c6d06f3634f1aa068946595ff782da99fab2 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 <%= fqdn %>
+ServerName <%= apache_server_name %>
 
 #
 # ServerRoot: The top of the directory tree under which the server's