diff --git a/manifests/init.pp b/manifests/init.pp index 6c5c51278..ea6e110f2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -123,70 +123,69 @@ ### migration the Right Way(tm) -- JDF if $client_body_buffer_size or - $client_body_temp_path or - $client_max_body_size or - $confd_purge or - $conf_dir or - $conf_template or - $daemon_user or - $events_use or - $fastcgi_cache_inactive or - $fastcgi_cache_key or - $fastcgi_cache_keys_zone or - $fastcgi_cache_levels or - $fastcgi_cache_max_size or - $fastcgi_cache_path or - $fastcgi_cache_use_stale or - $gzip or - $http_access_log or - $http_cfg_append or - $http_tcp_nodelay or - $http_tcp_nopush or - $keepalive_timeout or - $logdir or - $mail or - $multi_accept or - $names_hash_bucket_size or - $names_hash_max_size or - $nginx_error_log or - $pid or - $proxy_buffers or - $proxy_buffer_size or - $proxy_cache_inactive or - $proxy_cache_keys_zone or - $proxy_cache_levels or - $proxy_cache_max_size or - $proxy_cache_path or - $proxy_conf_template or - $proxy_connect_timeout or - $proxy_headers_hash_bucket_size or - $proxy_http_version or - $proxy_read_timeout or - $proxy_redirect or - $proxy_send_timeout or - $proxy_set_header or - $proxy_temp_path or - $run_dir or - $sendfile or - $server_tokens or - $spdy or - $super_user or - $temp_dir or - $types_hash_bucket_size or - $types_hash_max_size or - $vhost_purge or - $worker_connections or - $worker_processes or - $worker_rlimit_nofile or - $global_owner or - $global_group or - $global_mode or - $sites_available_owner or - $sites_available_group or - $sites_available_mode { - - include nginx::notice::puppet_module_data - } + $client_body_temp_path or + $client_max_body_size or + $confd_purge or + $conf_dir or + $conf_template or + $daemon_user or + $events_use or + $fastcgi_cache_inactive or + $fastcgi_cache_key or + $fastcgi_cache_keys_zone or + $fastcgi_cache_levels or + $fastcgi_cache_max_size or + $fastcgi_cache_path or + $fastcgi_cache_use_stale or + $gzip or + $http_access_log or + $http_cfg_append or + $http_tcp_nodelay or + $http_tcp_nopush or + $keepalive_timeout or + $logdir or + $mail or + $multi_accept or + $names_hash_bucket_size or + $names_hash_max_size or + $nginx_error_log or + $pid or + $proxy_buffers or + $proxy_buffer_size or + $proxy_cache_inactive or + $proxy_cache_keys_zone or + $proxy_cache_levels or + $proxy_cache_max_size or + $proxy_cache_path or + $proxy_conf_template or + $proxy_connect_timeout or + $proxy_headers_hash_bucket_size or + $proxy_http_version or + $proxy_read_timeout or + $proxy_redirect or + $proxy_send_timeout or + $proxy_set_header or + $proxy_temp_path or + $run_dir or + $sendfile or + $server_tokens or + $spdy or + $super_user or + $temp_dir or + $types_hash_bucket_size or + $types_hash_max_size or + $vhost_purge or + $worker_connections or + $worker_processes or + $worker_rlimit_nofile or + $global_owner or + $global_group or + $global_mode or + $sites_available_owner or + $sites_available_group or + $sites_available_mode { + include nginx::notice::puppet_module_data + } ### END DEPRECATION WARNING ### diff --git a/manifests/package.pp b/manifests/package.pp index 32ee01a03..ec394208e 100644 --- a/manifests/package.pp +++ b/manifests/package.pp @@ -77,8 +77,8 @@ class { 'nginx::package::gentoo': package_name => $package_name, package_ensure => $package_ensure, - require => Anchor['nginx::package::begin'], - before => Anchor['nginx::package::end'], + require => Anchor['nginx::package::begin'], + before => Anchor['nginx::package::end'], } } default: {