Merge pull request #809 from mhaskel/fix_travis

Fixing warning in rake validate

README.md

@@ -1715,12 +1715,12 @@ Ex:
 
 ```puppet
 apache::fastcgi::server { 'php':
-  host      => '127.0.0.1:9000',
-  timeout   => 15,
-  flush     => false,
-  faux_path => '/var/www/php.fcgi',
-  alias     => '/php.fcgi',
-  file_type => 'application/x-httpd-php'
+  host       => '127.0.0.1:9000',
+  timeout    => 15,
+  flush      => false,
+  faux_path  => '/var/www/php.fcgi',
+  fcgi_alias => '/php.fcgi',
+  file_type  => 'application/x-httpd-php'
 }
 ```
 

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

spec/defines/fastcgi_server_spec.rb

@@ -82,12 +82,12 @@
     describe ".conf content" do
       let :params do
         {
-          :host      => '127.0.0.1:9001',
-          :timeout   => 30,
-          :flush     => true,
-          :faux_path => '/var/www/php-www.fcgi',
-          :alias     => '/php-www.fcgi',
-          :file_type => 'application/x-httpd-php'
+          :host       => '127.0.0.1:9001',
+          :timeout    => 30,
+          :flush      => true,
+          :faux_path  => '/var/www/php-www.fcgi',
+          :fcgi_alias => '/php-www.fcgi',
+          :file_type  => 'application/x-httpd-php'
         }
       end
       let :expected do

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 %>