From 807db14fc1d294ebcd4f3f835a725149b0d6850a Mon Sep 17 00:00:00 2001 From: Juan Treminio Date: Sat, 28 Jun 2014 01:17:33 -0500 Subject: [PATCH 1/2] Changes $alias to $fcgi_alias to preent Puppet complaining about using that name --- manifests/fastcgi/server.pp | 2 +- templates/fastcgi/server.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/fastcgi/server.pp b/manifests/fastcgi/server.pp index 4937d4e0f..afc7c8860 100644 --- a/manifests/fastcgi/server.pp +++ b/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 diff --git a/templates/fastcgi/server.erb b/templates/fastcgi/server.erb index c16eae8cf..5920e784c 100644 --- a/templates/fastcgi/server.erb +++ b/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 %> From d6d120a4c92f343962bf1993b0163a650c671f04 Mon Sep 17 00:00:00 2001 From: Morgan Haskel Date: Tue, 5 Aug 2014 13:10:21 -0400 Subject: [PATCH 2/2] Update spec tests and README for fcgi_server Fixes #781 --- README.md | 12 ++++++------ spec/defines/fastcgi_server_spec.rb | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 46bde67cf..26b92e2b7 100644 --- a/README.md +++ b/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' } ``` diff --git a/spec/defines/fastcgi_server_spec.rb b/spec/defines/fastcgi_server_spec.rb index 794659e62..4a8762c86 100644 --- a/spec/defines/fastcgi_server_spec.rb +++ b/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