opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplify default vhost configuration by passing parameters directly to resource.

Browse source 
Prevent missing resource errors if custom configuration is used without default location.
This commit is contained in:
Steve Maddison 2015-05-20 12:38:20 +02:00
parent 58ef49662d
commit 62c8a1e558
1 changed files with 34 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
manifests/resource/vhost.pp
View file

@ -517,63 +517,46 @@ define nginx::resource::vhost (
if $use_default_location == true { if $use_default_location == true {
# Create the default location reference for the vHost # Create the default location reference for the vHost
::nginx::resource::location {"${name_sanitized}-default": ::nginx::resource::location {"${name_sanitized}-default":
ensure => $ensure, ensure => $ensure,
vhost => $name_sanitized, vhost => $name_sanitized,
ssl => $ssl, ssl => $ssl,
ssl_only => $ssl_only, ssl_only => $ssl_only,
location => '/', location => '/',
location_allow => $location_allow, location_allow => $location_allow,
location_deny => $location_deny, location_deny => $location_deny,
proxy => $proxy, proxy => $proxy,
proxy_redirect => $proxy_redirect, proxy_redirect => $proxy_redirect,
proxy_read_timeout => $proxy_read_timeout, proxy_read_timeout => $proxy_read_timeout,
proxy_connect_timeout => $proxy_connect_timeout, proxy_connect_timeout => $proxy_connect_timeout,
proxy_cache => $proxy_cache, proxy_cache => $proxy_cache,
proxy_cache_valid => $proxy_cache_valid, proxy_cache_valid => $proxy_cache_valid,
proxy_method => $proxy_method, proxy_method => $proxy_method,
proxy_set_header => $proxy_set_header, proxy_set_header => $proxy_set_header,
proxy_set_body => $proxy_set_body, proxy_set_body => $proxy_set_body,
fastcgi => $fastcgi, fastcgi => $fastcgi,
fastcgi_params => $fastcgi_params, fastcgi_params => $fastcgi_params,
fastcgi_script => $fastcgi_script, fastcgi_script => $fastcgi_script,
uwsgi => $uwsgi, uwsgi => $uwsgi,
uwsgi_params => $uwsgi_params, uwsgi_params => $uwsgi_params,
try_files => $try_files, try_files => $try_files,
www_root => $www_root, www_root => $www_root,
autoindex => $autoindex, autoindex => $autoindex,
index_files => $index_files, index_files => $index_files,
location_custom_cfg => $location_custom_cfg, location_custom_cfg => $location_custom_cfg,
notify => Class['::nginx::service'], location_cfg_prepend => $location_cfg_prepend,
rewrite_rules => $rewrite_rules, location_cfg_append => $location_cfg_append,
raw_prepend => $location_raw_prepend, location_custom_cfg_prepend => $location_custom_cfg_prepend,
raw_append => $location_raw_append location_custom_cfg_append => $location_custom_cfg_append,
rewrite_rules => $rewrite_rules,
raw_prepend => $location_raw_prepend,
raw_append => $location_raw_append,
notify => Class['nginx::service'],
} }
$root = undef $root = undef
} else { } else {
$root = $www_root $root = $www_root
} }
# Support location_cfg_prepend and location_cfg_append on default location created by vhost
if $location_cfg_prepend {
Nginx::Resource::Location["${name_sanitized}-default"] {
location_cfg_prepend => $location_cfg_prepend }
}
if $location_cfg_append {
Nginx::Resource::Location["${name_sanitized}-default"] {
location_cfg_append => $location_cfg_append }
}
if $location_custom_cfg_prepend {
Nginx::Resource::Location["${name_sanitized}-default"] {
location_custom_cfg_prepend => $location_custom_cfg_prepend }
}
if $location_custom_cfg_append {
Nginx::Resource::Location["${name_sanitized}-default"] {
location_custom_cfg_append => $location_custom_cfg_append }
}
if $fastcgi != undef and !defined(File[$fastcgi_params]) { if $fastcgi != undef and !defined(File[$fastcgi_params]) {
file { $fastcgi_params: file { $fastcgi_params:
ensure => present, ensure => present,