diff --git a/manifests/init.pp b/manifests/init.pp index fceee02c1..2e62e3446 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -214,71 +214,75 @@ manage_repo => $manage_repo, } - class { 'nginx::config': - client_body_buffer_size => $client_body_buffer_size, - client_body_temp_path => $client_body_temp_path, - client_max_body_size => $client_max_body_size, - confd_purge => $confd_purge, - conf_dir => $conf_dir, - conf_template => $conf_template, - daemon_user => $daemon_user, - events_use => $events_use, - 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, - gzip => $gzip, - http_access_log => $http_access_log, - http_cfg_append => $http_cfg_append, - http_tcp_nodelay => $http_tcp_nodelay, - http_tcp_nopush => $http_tcp_nopush, - keepalive_timeout => $keepalive_timeout, - logdir => $logdir, - mail => $mail, - 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, - pid => $pid, - proxy_buffers => $proxy_buffers, - proxy_buffer_size => $proxy_buffer_size, - 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_connect_timeout => $proxy_connect_timeout, - proxy_headers_hash_bucket_size => $proxy_headers_hash_bucket_size, - proxy_http_version => $proxy_http_version, - proxy_read_timeout => $proxy_read_timeout, - proxy_redirect => $proxy_redirect, - proxy_send_timeout => $proxy_send_timeout, - proxy_set_header => $proxy_set_header, - proxy_temp_path => $proxy_temp_path, - run_dir => $run_dir, - sendfile => $sendfile, - server_tokens => $server_tokens, - spdy => $spdy, - super_user => $super_user, - temp_dir => $temp_dir, - types_hash_bucket_size => $types_hash_bucket_size, - types_hash_max_size => $types_hash_max_size, - vhost_purge => $vhost_purge, - worker_connections => $worker_connections, - worker_processes => $worker_processes, - worker_rlimit_nofile => $worker_rlimit_nofile, - global_owner => $global_owner, - global_group => $global_group, - global_mode => $global_mode, - sites_available_owner => $sites_available_owner, - sites_available_group => $sites_available_group, - sites_available_mode => $sites_available_mode, - require => Class['nginx::package'], - notify => Class['nginx::service'], + ## This `if` statement is here in the event a user cannot use + ## Hiera based parameter overrides. Will not be here in 1.0 release + if !defined(Class['nginx::config']) { + class { 'nginx::config': + client_body_buffer_size => $client_body_buffer_size, + client_body_temp_path => $client_body_temp_path, + client_max_body_size => $client_max_body_size, + confd_purge => $confd_purge, + conf_dir => $conf_dir, + conf_template => $conf_template, + daemon_user => $daemon_user, + events_use => $events_use, + 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, + gzip => $gzip, + http_access_log => $http_access_log, + http_cfg_append => $http_cfg_append, + http_tcp_nodelay => $http_tcp_nodelay, + http_tcp_nopush => $http_tcp_nopush, + keepalive_timeout => $keepalive_timeout, + logdir => $logdir, + mail => $mail, + 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, + pid => $pid, + proxy_buffers => $proxy_buffers, + proxy_buffer_size => $proxy_buffer_size, + 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_connect_timeout => $proxy_connect_timeout, + proxy_headers_hash_bucket_size => $proxy_headers_hash_bucket_size, + proxy_http_version => $proxy_http_version, + proxy_read_timeout => $proxy_read_timeout, + proxy_redirect => $proxy_redirect, + proxy_send_timeout => $proxy_send_timeout, + proxy_set_header => $proxy_set_header, + proxy_temp_path => $proxy_temp_path, + run_dir => $run_dir, + sendfile => $sendfile, + server_tokens => $server_tokens, + spdy => $spdy, + super_user => $super_user, + temp_dir => $temp_dir, + types_hash_bucket_size => $types_hash_bucket_size, + types_hash_max_size => $types_hash_max_size, + vhost_purge => $vhost_purge, + worker_connections => $worker_connections, + worker_processes => $worker_processes, + worker_rlimit_nofile => $worker_rlimit_nofile, + global_owner => $global_owner, + global_group => $global_group, + global_mode => $global_mode, + sites_available_owner => $sites_available_owner, + sites_available_group => $sites_available_group, + sites_available_mode => $sites_available_mode, + require => Class['nginx::package'], + notify => Class['nginx::service'], + } } class { 'nginx::service': }