diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-01-07 22:22:23 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-01-07 22:22:23 -0200 |
| commit | a9f63debd2e2486c2c425523a6febfd0ecf70b88 (patch) | |
| tree | a6a50fde9bc0936f1371f4cd96a6fd512cff8a17 | |
| parent | 979b1a5b978e48ea7de47314823dff5930161943 (diff) | |
| download | puppet-apache-a9f63debd2e2486c2c425523a6febfd0ecf70b88.tar.gz puppet-apache-a9f63debd2e2486c2c425523a6febfd0ecf70b88.tar.bz2 | |
Using $hosting_domain instead of $apache_use_domain
| -rw-r--r-- | manifests/init.pp | 4 | ||||
| -rw-r--r-- | templates/error.erb | 4 | ||||
| -rw-r--r-- | 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 %> |