From 8cb8a31ade796fcc0b67042d30f685dcd1be63ab Mon Sep 17 00:00:00 2001 From: Todd Eddy Date: Wed, 7 Aug 2013 10:19:46 -0400 Subject: [PATCH] Removed path checking to allow additional logging options. --- manifests/resource/vhost.pp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/manifests/resource/vhost.pp b/manifests/resource/vhost.pp index b001b80..5c1a14f 100644 --- a/manifests/resource/vhost.pp +++ b/manifests/resource/vhost.pp @@ -46,8 +46,10 @@ # [*rewrite_to_https*] - Adds a server directive and rewrite rule to # rewrite to ssl # [*include_files*] - Adds include files to vhost -# [*access_log*] - Full path where to write access log, or off -# [*error_log*] - Full path where to write error log, or off +# [*access_log*] - Where to write access log. May add additional +# 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: # @@ -137,16 +139,10 @@ define nginx::resource::vhost ( undef => "${nginx::params::nx_logdir}/${domain_log_name}.access.log", default => $access_log, } - if ($access_log_real != 'off') { - validate_absolute_path($access_log_real) - } $error_log_real = $error_log ? { undef => "${nginx::params::nx_logdir}/${domain_log_name}.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. # 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", default => $access_log, } - if ($ssl_access_log != 'off') { - validate_absolute_path($ssl_access_log) - } $ssl_error_log = $error_log ? { undef => "${nginx::params::nx_logdir}/ssl-${domain_log_name}.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": ensure => $ensure ? { 'absent' => absent,