summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/error.erb4
-rw-r--r--templates/site.erb4
2 files changed, 4 insertions, 4 deletions
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 %>