Sorted all parameters alphabetically in the main nginx class and the nginx::config class.
This commit is contained in:
Jan Örnstedt
Родитель
99df70b3dd
Коммит
1bc31631d4
|
|
@ -14,43 +14,43 @@
|
|||
#
|
||||
# This class file is not called directly
|
||||
class nginx::config(
|
||||
$worker_processes = $nginx::params::nx_worker_processes,
|
||||
$worker_connections = $nginx::params::nx_worker_connections,
|
||||
$worker_rlimit_nofile = $nginx::params::nx_worker_rlimit_nofile,
|
||||
$multi_accept = $nginx::params::nx_multi_accept,
|
||||
$events_use = $nginx::params::nx_events_use,
|
||||
$client_max_body_size = $nginx::params::nx_client_max_body_size,
|
||||
$confd_purge = $nginx::params::nx_confd_purge,
|
||||
$vhost_purge = $nginx::params::nx_vhost_purge,
|
||||
$server_tokens = $nginx::params::nx_server_tokens,
|
||||
$proxy_set_header = $nginx::params::nx_proxy_set_header,
|
||||
$proxy_cache_path = $nginx::params::nx_proxy_cache_path,
|
||||
$proxy_cache_levels = $nginx::params::nx_proxy_cache_levels,
|
||||
$proxy_cache_keys_zone = $nginx::params::nx_proxy_cache_keys_zone,
|
||||
$proxy_cache_max_size = $nginx::params::nx_proxy_cache_max_size,
|
||||
$proxy_cache_inactive = $nginx::params::nx_proxy_cache_inactive,
|
||||
$fastcgi_cache_path = $nginx::params::nx_fastcgi_cache_path,
|
||||
$fastcgi_cache_levels = $nginx::params::nx_fastcgi_cache_levels,
|
||||
$fastcgi_cache_keys_zone = $nginx::params::nx_fastcgi_cache_keys_zone,
|
||||
$fastcgi_cache_max_size = $nginx::params::nx_fastcgi_cache_max_size,
|
||||
$conf_template = $nginx::params::nx_conf_template,
|
||||
$events_use = $nginx::params::nx_events_use,
|
||||
$fastcgi_cache_inactive = $nginx::params::nx_fastcgi_cache_inactive,
|
||||
$fastcgi_cache_key = $nginx::params::nx_fastcgi_cache_key,
|
||||
$fastcgi_cache_keys_zone = $nginx::params::nx_fastcgi_cache_keys_zone,
|
||||
$fastcgi_cache_levels = $nginx::params::nx_fastcgi_cache_levels,
|
||||
$fastcgi_cache_max_size = $nginx::params::nx_fastcgi_cache_max_size,
|
||||
$fastcgi_cache_path = $nginx::params::nx_fastcgi_cache_path,
|
||||
$fastcgi_cache_use_stale = $nginx::params::nx_fastcgi_cache_use_stale,
|
||||
$proxy_http_version = $nginx::params::nx_proxy_http_version,
|
||||
$gzip = $nginx::params::nx_gzip,
|
||||
$http_access_log = $nginx::params::nx_http_access_log,
|
||||
$http_cfg_append = $nginx::params::nx_http_cfg_append,
|
||||
$multi_accept = $nginx::params::nx_multi_accept,
|
||||
$names_hash_bucket_size = $nginx::params::nx_names_hash_bucket_size,
|
||||
$names_hash_max_size = $nginx::params::nx_names_hash_max_size,
|
||||
$types_hash_max_size = $nginx::params::nx_types_hash_max_size,
|
||||
$types_hash_bucket_size = $nginx::params::nx_types_hash_bucket_size,
|
||||
$client_max_body_size = $nginx::params::nx_client_max_body_size,
|
||||
$proxy_buffers = $nginx::params::nx_proxy_buffers,
|
||||
$http_cfg_append = $nginx::params::nx_http_cfg_append,
|
||||
$nginx_error_log = $nginx::params::nx_nginx_error_log,
|
||||
$http_access_log = $nginx::params::nx_http_access_log,
|
||||
$proxy_buffers = $nginx::params::nx_proxy_buffers,
|
||||
$proxy_buffer_size = $nginx::params::nx_proxy_buffer_size,
|
||||
$gzip = $nginx::params::nx_gzip,
|
||||
$conf_template = $nginx::params::nx_conf_template,
|
||||
$proxy_cache_inactive = $nginx::params::nx_proxy_cache_inactive,
|
||||
$proxy_cache_keys_zone = $nginx::params::nx_proxy_cache_keys_zone,
|
||||
$proxy_cache_levels = $nginx::params::nx_proxy_cache_levels,
|
||||
$proxy_cache_max_size = $nginx::params::nx_proxy_cache_max_size,
|
||||
$proxy_cache_path = $nginx::params::nx_proxy_cache_path,
|
||||
$proxy_conf_template = $nginx::params::nx_proxy_conf_template,
|
||||
$proxy_redirect = $nginx::params::nx_proxy_redirect,
|
||||
$proxy_headers_hash_bucket_size = $nginx::params::nx_proxy_headers_hash_bucket_size,
|
||||
$proxy_http_version = $nginx::params::nx_proxy_http_version,
|
||||
$proxy_redirect = $nginx::params::nx_proxy_redirect,
|
||||
$proxy_set_header = $nginx::params::nx_proxy_set_header,
|
||||
$server_tokens = $nginx::params::nx_server_tokens,
|
||||
$types_hash_bucket_size = $nginx::params::nx_types_hash_bucket_size,
|
||||
$types_hash_max_size = $nginx::params::nx_types_hash_max_size,
|
||||
$vhost_purge = $nginx::params::nx_vhost_purge,
|
||||
$worker_connections = $nginx::params::nx_worker_connections,
|
||||
$worker_processes = $nginx::params::nx_worker_processes,
|
||||
$worker_rlimit_nofile = $nginx::params::nx_worker_rlimit_nofile,
|
||||
) inherits nginx::params {
|
||||
|
||||
File {
|
||||
|
|
|
|||
|
|
@ -29,53 +29,53 @@
|
|||
# include nginx
|
||||
# }
|
||||
class nginx (
|
||||
$worker_processes = $nginx::params::nx_worker_processes,
|
||||
$worker_connections = $nginx::params::nx_worker_connections,
|
||||
$worker_rlimit_nofile = $nginx::params::nx_worker_rlimit_nofile,
|
||||
$multi_accept = $nginx::params::nx_multi_accept,
|
||||
$events_use = $nginx::params::nx_events_use,
|
||||
$package_name = $nginx::params::package_name,
|
||||
$package_ensure = $nginx::params::package_ensure,
|
||||
$package_source = $nginx::params::package_source,
|
||||
$proxy_set_header = $nginx::params::nx_proxy_set_header,
|
||||
$proxy_http_version = $nginx::params::nx_proxy_http_version,
|
||||
$client_max_body_size = $nginx::params::nx_client_max_body_size,
|
||||
$confd_purge = $nginx::params::nx_confd_purge,
|
||||
$vhost_purge = $nginx::params::nx_vhost_purge,
|
||||
$proxy_cache_path = $nginx::params::nx_proxy_cache_path,
|
||||
$proxy_cache_levels = $nginx::params::nx_proxy_cache_levels,
|
||||
$proxy_cache_keys_zone = $nginx::params::nx_proxy_cache_keys_zone,
|
||||
$proxy_cache_max_size = $nginx::params::nx_proxy_cache_max_size,
|
||||
$proxy_cache_inactive = $nginx::params::nx_proxy_cache_inactive,
|
||||
$fastcgi_cache_path = $nginx::params::nx_fastcgi_cache_path,
|
||||
$fastcgi_cache_levels = $nginx::params::nx_fastcgi_cache_levels,
|
||||
$fastcgi_cache_keys_zone = $nginx::params::nx_fastcgi_cache_keys_zone,
|
||||
$fastcgi_cache_max_size = $nginx::params::nx_fastcgi_cache_max_size,
|
||||
$configtest_enable = $nginx::params::nx_configtest_enable,
|
||||
$conf_template = $nginx::params::nx_conf_template,
|
||||
$events_use = $nginx::params::nx_events_use,
|
||||
$fastcgi_cache_inactive = $nginx::params::nx_fastcgi_cache_inactive,
|
||||
$fastcgi_cache_key = $nginx::params::nx_fastcgi_cache_key,
|
||||
$fastcgi_cache_keys_zone = $nginx::params::nx_fastcgi_cache_keys_zone,
|
||||
$fastcgi_cache_levels = $nginx::params::nx_fastcgi_cache_levels,
|
||||
$fastcgi_cache_max_size = $nginx::params::nx_fastcgi_cache_max_size,
|
||||
$fastcgi_cache_path = $nginx::params::nx_fastcgi_cache_path,
|
||||
$fastcgi_cache_use_stale = $nginx::params::nx_fastcgi_cache_use_stale,
|
||||
$configtest_enable = $nginx::params::nx_configtest_enable,
|
||||
$service_restart = $nginx::params::nx_service_restart,
|
||||
$service_ensure = $nginx::params::nx_service_ensure,
|
||||
$gzip = $nginx::params::nx_gzip,
|
||||
$http_access_log = $nginx::params::nx_http_access_log,
|
||||
$http_cfg_append = $nginx::params::nx_http_cfg_append,
|
||||
$mail = $nginx::params::nx_mail,
|
||||
$server_tokens = $nginx::params::nx_server_tokens,
|
||||
$client_max_body_size = $nginx::params::nx_client_max_body_size,
|
||||
$manage_repo = $nginx::params::manage_repo,
|
||||
$multi_accept = $nginx::params::nx_multi_accept,
|
||||
$names_hash_bucket_size = $nginx::params::nx_names_hash_bucket_size,
|
||||
$names_hash_max_size = $nginx::params::nx_names_hash_max_size,
|
||||
$proxy_buffers = $nginx::params::nx_proxy_buffers,
|
||||
$proxy_buffer_size = $nginx::params::nx_proxy_buffer_size,
|
||||
$http_cfg_append = $nginx::params::nx_http_cfg_append,
|
||||
$nginx_error_log = $nginx::params::nx_nginx_error_log,
|
||||
$http_access_log = $nginx::params::nx_http_access_log,
|
||||
$gzip = $nginx::params::nx_gzip,
|
||||
$conf_template = $nginx::params::nx_conf_template,
|
||||
$proxy_conf_template = $nginx::params::nx_proxy_conf_template,
|
||||
$proxy_redirect = $nginx::params::nx_proxy_redirect,
|
||||
$proxy_headers_hash_bucket_size = $nginx::params::nx_proxy_headers_hash_bucket_size,
|
||||
$nginx_vhosts = {},
|
||||
$nginx_upstreams = {},
|
||||
$nginx_locations = {},
|
||||
$nginx_mailhosts = {},
|
||||
$manage_repo = $nginx::params::manage_repo,
|
||||
$nginx_upstreams = {},
|
||||
$nginx_vhosts = {},
|
||||
$package_ensure = $nginx::params::package_ensure,
|
||||
$package_name = $nginx::params::package_name,
|
||||
$package_source = $nginx::params::package_source,
|
||||
$proxy_buffers = $nginx::params::nx_proxy_buffers,
|
||||
$proxy_buffer_size = $nginx::params::nx_proxy_buffer_size,
|
||||
$proxy_cache_inactive = $nginx::params::nx_proxy_cache_inactive,
|
||||
$proxy_cache_keys_zone = $nginx::params::nx_proxy_cache_keys_zone,
|
||||
$proxy_cache_levels = $nginx::params::nx_proxy_cache_levels,
|
||||
$proxy_cache_max_size = $nginx::params::nx_proxy_cache_max_size,
|
||||
$proxy_cache_path = $nginx::params::nx_proxy_cache_path,
|
||||
$proxy_conf_template = $nginx::params::nx_proxy_conf_template,
|
||||
$proxy_headers_hash_bucket_size = $nginx::params::nx_proxy_headers_hash_bucket_size,
|
||||
$proxy_http_version = $nginx::params::nx_proxy_http_version,
|
||||
$proxy_redirect = $nginx::params::nx_proxy_redirect,
|
||||
$proxy_set_header = $nginx::params::nx_proxy_set_header,
|
||||
$server_tokens = $nginx::params::nx_server_tokens,
|
||||
$service_ensure = $nginx::params::nx_service_ensure,
|
||||
$service_restart = $nginx::params::nx_service_restart,
|
||||
$vhost_purge = $nginx::params::nx_vhost_purge,
|
||||
$worker_connections = $nginx::params::nx_worker_connections,
|
||||
$worker_processes = $nginx::params::nx_worker_processes,
|
||||
$worker_rlimit_nofile = $nginx::params::nx_worker_rlimit_nofile,
|
||||
) inherits nginx::params {
|
||||
|
||||
include stdlib
|
||||
|
|
@ -158,41 +158,41 @@ class nginx (
|
|||
}
|
||||
|
||||
class { 'nginx::config':
|
||||
worker_processes => $worker_processes,
|
||||
worker_connections => $worker_connections,
|
||||
worker_rlimit_nofile => $worker_rlimit_nofile,
|
||||
multi_accept => $multi_accept,
|
||||
client_max_body_size => $client_max_body_size,
|
||||
confd_purge => $confd_purge,
|
||||
conf_template => $conf_template,
|
||||
events_use => $events_use,
|
||||
proxy_set_header => $proxy_set_header,
|
||||
proxy_http_version => $proxy_http_version,
|
||||
proxy_cache_path => $proxy_cache_path,
|
||||
proxy_cache_levels => $proxy_cache_levels,
|
||||
proxy_cache_keys_zone => $proxy_cache_keys_zone,
|
||||
proxy_cache_max_size => $proxy_cache_max_size,
|
||||
proxy_cache_inactive => $proxy_cache_inactive,
|
||||
proxy_headers_hash_bucket_size => $proxy_headers_hash_bucket_size,
|
||||
fastcgi_cache_path => $fastcgi_cache_path,
|
||||
fastcgi_cache_levels => $fastcgi_cache_levels,
|
||||
fastcgi_cache_keys_zone => $fastcgi_cache_keys_zone,
|
||||
fastcgi_cache_max_size => $fastcgi_cache_max_size,
|
||||
fastcgi_cache_inactive => $fastcgi_cache_inactive,
|
||||
fastcgi_cache_key => $fastcgi_cache_key,
|
||||
fastcgi_cache_keys_zone => $fastcgi_cache_keys_zone,
|
||||
fastcgi_cache_levels => $fastcgi_cache_levels,
|
||||
fastcgi_cache_max_size => $fastcgi_cache_max_size,
|
||||
fastcgi_cache_path => $fastcgi_cache_path,
|
||||
fastcgi_cache_use_stale => $fastcgi_cache_use_stale,
|
||||
confd_purge => $confd_purge,
|
||||
vhost_purge => $vhost_purge,
|
||||
server_tokens => $server_tokens,
|
||||
client_max_body_size => $client_max_body_size,
|
||||
gzip => $gzip,
|
||||
http_access_log => $http_access_log,
|
||||
http_cfg_append => $http_cfg_append,
|
||||
multi_accept => $multi_accept,
|
||||
names_hash_bucket_size => $names_hash_bucket_size,
|
||||
names_hash_max_size => $names_hash_max_size,
|
||||
nginx_error_log => $nginx_error_log,
|
||||
proxy_buffers => $proxy_buffers,
|
||||
proxy_buffer_size => $proxy_buffer_size,
|
||||
http_cfg_append => $http_cfg_append,
|
||||
nginx_error_log => $nginx_error_log,
|
||||
http_access_log => $http_access_log,
|
||||
gzip => $gzip,
|
||||
conf_template => $conf_template,
|
||||
proxy_cache_inactive => $proxy_cache_inactive,
|
||||
proxy_cache_keys_zone => $proxy_cache_keys_zone,
|
||||
proxy_cache_levels => $proxy_cache_levels,
|
||||
proxy_cache_max_size => $proxy_cache_max_size,
|
||||
proxy_cache_path => $proxy_cache_path,
|
||||
proxy_conf_template => $proxy_conf_template,
|
||||
proxy_headers_hash_bucket_size => $proxy_headers_hash_bucket_size,
|
||||
proxy_http_version => $proxy_http_version,
|
||||
proxy_redirect => $proxy_redirect,
|
||||
proxy_set_header => $proxy_set_header,
|
||||
server_tokens => $server_tokens,
|
||||
vhost_purge => $vhost_purge,
|
||||
worker_connections => $worker_connections,
|
||||
worker_processes => $worker_processes,
|
||||
worker_rlimit_nofile => $worker_rlimit_nofile,
|
||||
require => Class['nginx::package'],
|
||||
notify => Class['nginx::service'],
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче