From a9f63debd2e2486c2c425523a6febfd0ecf70b88 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 7 Jan 2010 22:22:23 -0200
Subject: Using $hosting_domain instead of $apache_use_domain

---
 manifests/init.pp   | 4 ++--
 templates/error.erb | 4 ++--
 templates/site.erb  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 4fb8212..9235a43 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -92,8 +92,8 @@ class apache {
     '': { $apache_error_dest = "${apache_error_folder}/index.html" }
   }
 
-  case $apache_use_domain {
-    '': { $apache_use_domain = $domain }
+  case $hosting_domain {
+    '': { $hosting_domain = $domain }
   }
 
   define site($ensure = present, $docroot = false, $redirect = false,
diff --git a/templates/error.erb b/templates/error.erb
index fef5dd7..e0dbb0e 100644
--- a/templates/error.erb
+++ b/templates/error.erb
@@ -1,7 +1,7 @@
 # vhost to handle inexistent vhosts
 <VirtualHost *:80>
-  ServerName error.<%= domain %>
-  ServerAlias *.<%= domain %>
+  ServerName error.<%= hosting_domain %>
+  ServerAlias *.<%= hosting_domain %>
   DocumentRoot <%= apache_error_folder %>
   ErrorDocument 404 <%= apache_error_dest %>
 
diff --git a/templates/site.erb b/templates/site.erb
index 56cc929..18fce97 100644
--- a/templates/site.erb
+++ b/templates/site.erb
@@ -1,9 +1,9 @@
 # begin vhost for <%= title %>
 <VirtualHost *:80>
-   ServerName <%= title %>.<%= apache_use_domain %>
+   ServerName <%= title %>.<%= hosting_domain %>
 <% if server_alias != false %>   ServerAlias <%= server_alias %><% end %>
    DocumentRoot <%= docroot %>
-<% if redirect_match != false %>   RedirectMatch ^/$ <%= protocol %>://<%= title %>.<%= apache_use_domain %>/<%= redirect_match %><% end %>
+<% if redirect_match != false %>   RedirectMatch ^/$ <%= protocol %>://<%= title %>.<%= hosting_domain %>/<%= redirect_match %><% end %>
 <% if redirect != false %>   Redirect <%= redirect %><% end %>
 <% if use != false %><% use.each do |instance| -%>
    Use <%= instance %>
-- 
cgit v1.2.3