diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2009-11-05 16:05:09 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2009-11-05 16:05:09 -0200 |
| commit | 6f720b97aa1ada7011a6883686d495c229c5cb08 (patch) | |
| tree | faf8676499d8a78536e9e953f44f69b82efdb65a | |
| parent | 91fe806a05f6add611459c0be755cfcf50ea1d90 (diff) | |
| download | puppet-apache-6f720b97aa1ada7011a6883686d495c229c5cb08.tar.gz puppet-apache-6f720b97aa1ada7011a6883686d495c229c5cb08.tar.bz2 | |
Using server_alias instead of alias
| -rw-r--r-- | manifests/init.pp | 2 | ||||
| -rw-r--r-- | templates/website.erb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 3c5caf8..37cd242 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -60,7 +60,7 @@ class apache { # TODO: ensure folders exist with right modes and ownership define website($ensure = present, $docroot = false, $redirect = false, - $protocol = 'http', $alias = false, $use = false) { + $protocol = 'http', $server_alias = false, $use = false) { file { "/etc/apache2/sites-available/$title": ensure => $ensure, content => template('apache/website.erb'), diff --git a/templates/website.erb b/templates/website.erb index 156b4b1..ac41b9b 100644 --- a/templates/website.erb +++ b/templates/website.erb @@ -1,8 +1,8 @@ # begin vhost for <%= title %> <VirtualHost *:80> ServerName <%= title %>.<%= domain %> -<% if alias != false %> - ServerAlias <%= alias %> +<% if server_alias != false %> + ServerAlias <%= server_alias %> <% end %> DocumentRoot <%= docroot %> <% if redirect != false %> |