diff --git a/manifests/package/redhat.pp b/manifests/package/redhat.pp index 27dec42b6..85fda93b3 100644 --- a/manifests/package/redhat.pp +++ b/manifests/package/redhat.pp @@ -33,11 +33,19 @@ descr => 'nginx repo', enabled => '1', gpgcheck => '1', + priority => '1', gpgkey => "http://nginx.org/keys/nginx_signing.key", } + #Define file for nginx-repo so puppet doesn't delete it + file { '/etc/yum.repos.d/nginx-release.repo': + ensure => present, + require => Yumrepo['nginx-release'], + } + package { $redhat_packages: ensure => present, require => Yumrepo['nginx-release'], } + } diff --git a/manifests/resource/location.pp b/manifests/resource/location.pp index d78dd7f74..8f2c7c8ee 100644 --- a/manifests/resource/location.pp +++ b/manifests/resource/location.pp @@ -14,6 +14,7 @@ # [*fastcgi*] - location of fastcgi (host:port) # [*fastcgi_params*] - optional alternative fastcgi_params file to use # [*fastcgi_script*] - optional SCRIPT_FILE parameter +# [*fastcgi_split_path*] - Allows settings of fastcgi_split_path_info so that you can split the script_name and path_info via regex # [*ssl*] - Indicates whether to setup SSL bindings for this location. # [*ssl_only*] - Required if the SSL and normal vHost have the same port. # [*location_alias*] - Path to be used as basis for serving requests for this location @@ -77,6 +78,7 @@ $fastcgi = undef, $fastcgi_params = '/etc/nginx/fastcgi_params', $fastcgi_script = undef, + $fastcgi_split_path = undef, $ssl = false, $ssl_only = false, $location_alias = undef, diff --git a/templates/vhost/vhost_location_fastcgi.erb b/templates/vhost/vhost_location_fastcgi.erb index 48d9ddb3c..1306729a8 100644 --- a/templates/vhost/vhost_location_fastcgi.erb +++ b/templates/vhost/vhost_location_fastcgi.erb @@ -4,6 +4,12 @@ <% end -%><% end -%> <% if defined? @www_root -%> root <%= @www_root %>; +<% end -%> +<% if @fastcgi_split_path -%> + fastcgi_split_path_info <%= @fastcgi_split_path %>; +<% end -%> +<% if @try_files -%> + try_files <% @try_files.each do |try| -%> <%= try %> <% end -%>; <% end -%> include <%= @fastcgi_params %>; fastcgi_pass <%= @fastcgi %>;