Merge branch 'change-alias-variable-name' of github.com:puphpet/puppetlabs-apache into puphpet-change-alias-variable-name

Conflicts:
	templates/fastcgi/server.erb

Author: Morgan Haskel

manifests/fastcgi/server.pp

@@ -3,7 +3,7 @@
   $timeout       = 15,
   $flush         = false,
   $faux_path     = "/var/www/${name}.fcgi",
-  $alias         = "/${name}.fcgi",
+  $fcgi_alias    = "/${name}.fcgi",
   $file_type     = 'application/x-httpd-php'
 ) {
   include apache::mod::fastcgi

templates/fastcgi/server.erb

@@ -1,3 +1,3 @@
 FastCGIExternalServer <%= @faux_path %> -idle-timeout <%= @timeout %> <%= if @flush then '-flush' end %> -host <%= @host %>
-Alias <%= @alias %> <%= @faux_path %>
-Action <%= @file_type %> <%= @alias %>
+Alias <%= @fcgi_alias %> <%= @faux_path %>
+Action <%= @file_type %> <%= @fcgi_alias %>