Merge pull request #97 from justicel/master
Fixed RHEL package install and added some fastcgi options
This commit is contained in:
commit
d15509e6cd
3 changed files with 16 additions and 0 deletions
|
@ -33,11 +33,19 @@ class nginx::package::redhat {
|
|||
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'],
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -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 @@ define nginx::resource::location (
|
|||
$fastcgi = undef,
|
||||
$fastcgi_params = '/etc/nginx/fastcgi_params',
|
||||
$fastcgi_script = undef,
|
||||
$fastcgi_split_path = undef,
|
||||
$ssl = false,
|
||||
$ssl_only = false,
|
||||
$location_alias = undef,
|
||||
|
|
|
@ -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 %>;
|
||||
|
|
Loading…
Reference in a new issue