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

Removed path checking to allow additional logging options.

Browse source
This commit is contained in:
Todd Eddy 2013-08-07 10:19:46 -04:00
parent c6cd476c82
commit 8cb8a31ade
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
manifests/resource/vhost.pp
View file

@ -46,8 +46,10 @@
# [*rewrite_to_https*] - Adds a server directive and rewrite rule to # [*rewrite_to_https*] - Adds a server directive and rewrite rule to
# rewrite to ssl # rewrite to ssl
# [*include_files*] - Adds include files to vhost # [*include_files*] - Adds include files to vhost
# [*access_log*] - Full path where to write access log, or off # [*access_log*] - Where to write access log. May add additional
# [*error_log*] - Full path where to write error log, or off # options like log format to the end.
# [*error_log*] - Where to write error log. May add additional
# options like error level to the end.
# #
# Actions: # Actions:
# #
@ -137,16 +139,10 @@ define nginx::resource::vhost (
undef => "${nginx::params::nx_logdir}/${domain_log_name}.access.log", undef => "${nginx::params::nx_logdir}/${domain_log_name}.access.log",
default => $access_log, default => $access_log,
} }
if ($access_log_real != 'off') {
validate_absolute_path($access_log_real)
}
$error_log_real = $error_log ? { $error_log_real = $error_log ? {
undef => "${nginx::params::nx_logdir}/${domain_log_name}.error.log", undef => "${nginx::params::nx_logdir}/${domain_log_name}.error.log",
default => $error_log, default => $error_log,
} }
if ($error_log_real != 'off') {
validate_absolute_path($error_log_real)
}
# Use the File Fragment Pattern to construct the configuration files. # Use the File Fragment Pattern to construct the configuration files.
# Create the base configuration file reference. # Create the base configuration file reference.
@ -217,16 +213,10 @@ define nginx::resource::vhost (
undef => "${nginx::params::nx_logdir}/ssl-${domain_log_name}.access.log", undef => "${nginx::params::nx_logdir}/ssl-${domain_log_name}.access.log",
default => $access_log, default => $access_log,
} }
if ($ssl_access_log != 'off') {
validate_absolute_path($ssl_access_log)
}
$ssl_error_log = $error_log ? { $ssl_error_log = $error_log ? {
undef => "${nginx::params::nx_logdir}/ssl-${domain_log_name}.error.log", undef => "${nginx::params::nx_logdir}/ssl-${domain_log_name}.error.log",
default => $error_log, default => $error_log,
} }
if ($ssl_error_log != 'off') {
validate_absolute_path($ssl_error_log)
}
file { "${nginx::config::nx_temp_dir}/nginx.d/${name}-700-ssl": file { "${nginx::config::nx_temp_dir}/nginx.d/${name}-700-ssl":
ensure => $ensure ? { ensure => $ensure ? {
'absent' => absent, 'absent' => absent,