Add alias_path possibility

Author: raoulbhatia

manifests/resource/location.pp

@@ -39,6 +39,7 @@
   $auth_basic          = undef,
   $www_root           = undef,
   $create_www_root    = false,
+  $alias_path         = false,
   $owner              = '',
   $groupowner         = '',
   $redirect           = undef,
@@ -99,21 +100,33 @@
   }
 
   ## Check for various error condtiions
+  # Check vhost
   if ($vhost == undef) {
     fail('Cannot create a location reference without attaching to a virtual host')
   }
-  if (($www_root == undef) and ($proxy == undef) and ($redirect == undef)) {
-    fail('Cannot create a location reference without a www_root, proxy or redirect defined')
+  # Check www_root/proxy/redirect/alias_path
+  if (($www_root == undef) and ($proxy == undef) and ($redirect == undef) and ($alias_path == undef)) {
+    fail('Cannot create a location reference without a www_root, proxy, redirect, or alias_path defined')
   }
-  if (($www_root != undef) and ($proxy != undef)) {
-    fail('Cannot define both directory and proxy in a virtual host')
+  $mutual_exclusive = 0
+  if ($www_root != undef) {
+    $mutual_exclusive += 1;
   }
-  if (($www_root != undef) and ($redirect != undef)) {
-    fail('Cannot define both directory and redirect in a virtual host')
+  if ($redirect != undef) {
+    $mutual_exclusive += 1;
   }
-  if (($proxy != undef) and ($redirect != undef)) {
-    fail('Cannot define both proxy and redirect in a virtual host')
+  if ($proxy != undef) {
+    $mutual_exclusive += 1;
+  }
+  if ($alias_path != undef) {
+    $mutual_exclusive += 1;
   }
+
+  if ($mutual_exclusive != 1) {
+    fail("Cannot define more than one of the following values: www_root: '$www_root', redirect: '$redirect', proxy: '$proxy', and alias_path: '$alias_path'!")
+  }
+
+  # Check auth
   if (($auth_basic_user_file != undef) and ($auth_basic == undef)) {
     fail('Cannot define auth_basic_user_file without auth_basic')
   }

templates/vhost/vhost_location_directory.erb

@@ -1,5 +1,10 @@
   location <%= @location %> {
+<% unless @www_root.nil? || @www_root.empty? -%>
     root  <%= @www_root %>;
+<% end -%>
+<% unless @alias_path.nil? || @alias_path.empty? -%>
+    alias_path  <%= @alias_path %>;
+<% end -%>
     index <% @index_files.each do |i| %> <%= i %> <% end %>;
 <% unless @auth_basic.nil? || @auth_basic.empty? -%>
     auth_basic <%= @auth_basic  %>;