From b317e3ac6756034b873a86a3d904535955a8aae6 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 7 Feb 2010 15:24:42 -0200
Subject: Introducing $apache_server_name

---
 manifests/init.pp          | 4 ++++
 templates/apache2.conf.erb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 8505d7c..f9c3a81 100644
--- 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 9ff6ea5..cc59c6d 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 <%= fqdn %>
+ServerName <%= apache_server_name %>
 
 #
 # ServerRoot: The top of the directory tree under which the server's
-- 
cgit v1.2.3