Using server_alias instead of alias

diff --git a/manifests/init.pp b/manifests/init.pp
index 3c5caf877fda39f4bac159064b40390fb314b879..37cd2421d6b768f6074b0e302fd06dcbfb1d8522 100644 (file)
--- 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 156b4b101ce0911758a74bee9661c9553cce67bb..ac41b9b395ea027b4ff81e37f5deeffb2d4a3a7b 100644 (file)
--- 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 %>