Using $hosting_domain instead of $apache_use_domain

diff --git a/manifests/init.pp b/manifests/init.pp
index 4fb8212d147f054c14de65cc1587b02c50cf4189..9235a4357d3614db63e872159ea85458f8e3062f 100644 (file)
--- 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 fef5dd7a3e6c8c63db554d7beeebab2a72b23a39..e0dbb0e950d9b959b29a1cc010c4b11fdfba6b5b 100644 (file)
--- 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 56cc9297579c0f8012afda68aece40cae71a3431..18fce97df75b5bf014ee98a2bfcafe6d38056fca 100644 (file)
--- 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 %>