Add $nx_types_hash_max_size params
Fix puppet-lint ERROR
This commit is contained in:
parent
1441edcfac
commit
74cfbe6c72
8 changed files with 21 additions and 18 deletions
|
@ -34,8 +34,8 @@ class nginx::config(
|
|||
}
|
||||
if $confd_purge == true {
|
||||
File["${nginx::params::nx_conf_dir}/conf.d"] {
|
||||
ignore => "vhost_autogen.conf",
|
||||
purge => true,
|
||||
ignore => "vhost_autogen.conf",
|
||||
purge => true,
|
||||
recurse => true,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -44,15 +44,15 @@ class nginx (
|
|||
}
|
||||
|
||||
class { 'nginx::config':
|
||||
worker_processes => $worker_processes,
|
||||
worker_connections => $worker_connections,
|
||||
proxy_set_header => $proxy_set_header,
|
||||
worker_processes => $worker_processes,
|
||||
worker_connections => $worker_connections,
|
||||
proxy_set_header => $proxy_set_header,
|
||||
confd_purge => $confd_purge,
|
||||
require => Class['nginx::package'],
|
||||
notify => Class['nginx::service'],
|
||||
require => Class['nginx::package'],
|
||||
notify => Class['nginx::service'],
|
||||
}
|
||||
|
||||
class { 'nginx::service':
|
||||
class { 'nginx::service':
|
||||
configtest_enable => $configtest_enable,
|
||||
service_restart => $service_restart,
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ class nginx::package {
|
|||
}
|
||||
}
|
||||
debian,ubuntu: {
|
||||
class { 'nginx::package::debian':
|
||||
class { 'nginx::package::debian':
|
||||
require => Anchor['nginx::package::begin'],
|
||||
before => Anchor['nginx::package::end'],
|
||||
}
|
||||
|
|
|
@ -27,6 +27,7 @@ class nginx::params {
|
|||
$nx_tcp_nodelay = on
|
||||
$nx_gzip = on
|
||||
|
||||
$nx_types_hash_max_size = 2048
|
||||
$nx_proxy_redirect = off
|
||||
$nx_proxy_set_header = [
|
||||
'Host $host', 'X-Real-IP $remote_addr',
|
||||
|
@ -58,7 +59,7 @@ class nginx::params {
|
|||
# Service restart after Nginx 0.7.53 could also be just "/path/to/nginx/bin -s HUP"
|
||||
# Some init scripts do a configtest, some don't. If configtest_enable it's true
|
||||
# then service restart will take $nx_service_restart value, forcing configtest.
|
||||
$nx_configtest_enable = false
|
||||
$nx_service_restart = "/etc/init.d/nginx configtest && /etc/init.d/nginx restart"
|
||||
$nx_configtest_enable = false
|
||||
$nx_service_restart = "/etc/init.d/nginx configtest && /etc/init.d/nginx restart"
|
||||
|
||||
}
|
||||
|
|
|
@ -12,11 +12,11 @@
|
|||
# with nginx::resource::upstream
|
||||
# [*proxy_read_timeout*] - Override the default the proxy read timeout value of 90 seconds
|
||||
# [*ssl*] - Indicates whether to setup SSL bindings for this location.
|
||||
# [*ssl_only*] - Required if the SSL and normal vHost have the same port.
|
||||
# [*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
|
||||
# [*stub_status*] - If true it will point configure module stub_status to provide nginx stats on location
|
||||
# [*location_cfg_prepend*] - It expects a hash with custom directives to put before anything else inside location
|
||||
# [*location_cfg_append*] - It expects a hash with custom directives to put after everything else inside location
|
||||
# [*location_cfg_append*] - It expects a hash with custom directives to put after everything else inside location
|
||||
# [*try_files*] - An array of file locations to try
|
||||
# [*option*] - Reserved for future use
|
||||
#
|
||||
|
@ -31,7 +31,7 @@
|
|||
# location => '/bob',
|
||||
# vhost => 'test2.local',
|
||||
# }
|
||||
#
|
||||
#
|
||||
# Custom config example to limit location on localhost,
|
||||
# create a hash with any extra custom config you want.
|
||||
# $my_config = {
|
||||
|
@ -55,7 +55,7 @@ define nginx::resource::location(
|
|||
$proxy = undef,
|
||||
$proxy_read_timeout = $nginx::params::nx_proxy_read_timeout,
|
||||
$ssl = false,
|
||||
$ssl_only = false,
|
||||
$ssl_only = false,
|
||||
$location_alias = undef,
|
||||
$option = undef,
|
||||
$stub_status = undef,
|
||||
|
|
|
@ -51,7 +51,7 @@ define nginx::resource::vhost(
|
|||
$ssl = false,
|
||||
$ssl_cert = undef,
|
||||
$ssl_key = undef,
|
||||
$ssl_port = '443',
|
||||
$ssl_port = '443',
|
||||
$proxy = undef,
|
||||
$proxy_read_timeout = $nginx::params::nx_proxy_read_timeout,
|
||||
$index_files = ['index.html', 'index.htm', 'index.php'],
|
||||
|
@ -94,7 +94,7 @@ define nginx::resource::vhost(
|
|||
notify => Class['nginx::service'],
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ($ssl == 'true') and ($ssl_port == $listen_port) {
|
||||
$ssl_only = 'true'
|
||||
}
|
||||
|
|
|
@ -20,7 +20,7 @@ class nginx::service(
|
|||
exec { 'rebuild-nginx-vhosts':
|
||||
command => "/bin/cat ${nginx::params::nx_temp_dir}/nginx.d/* > ${nginx::params::nx_conf_dir}/conf.d/vhost_autogen.conf",
|
||||
refreshonly => true,
|
||||
unless => "/usr/bin/test ! -f ${nginx::params::nx_temp_dir}/nginx.d/*",
|
||||
unless => "/usr/bin/test ! -f ${nginx::params::nx_temp_dir}/nginx.d/*",
|
||||
subscribe => File["${nginx::params::nx_temp_dir}/nginx.d"],
|
||||
}
|
||||
service { "nginx":
|
||||
|
|
|
@ -24,6 +24,8 @@ http {
|
|||
keepalive_timeout <%= scope.lookupvar('nginx::params::nx_keepalive_timeout')%>;
|
||||
tcp_nodelay <%= scope.lookupvar('nginx::params::nx_tcp_nodelay')%>;
|
||||
|
||||
types_hash_max_size <%= scope.lookupvar('nginx::params::nx_types_hash_max_size')%>;
|
||||
|
||||
<% if scope.lookupvar('nginx::params::nx_gzip') == 'on' %>
|
||||
gzip on;
|
||||
gzip_disable "MSIE [1-6]\.(?!.*SV1)";
|
||||
|
|
Loading…
Reference in a new issue