From 507bc943e7376f0d005f5b2edd27f98a11ebfb20 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Sun, 30 Sep 2018 23:40:58 +0200 Subject: [PATCH] Propery handle ${client_body,proxy}_temp_path The template already allowed setting it to false. This completes it. --- manifests/config.pp | 17 ++++++++++------- manifests/init.pp | 4 ++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index 1ede16a78..0fb0523a1 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -182,15 +182,18 @@ group => $log_group, } - file {$client_body_temp_path: - ensure => directory, - owner => $daemon_user, + if $client_body_temp_path { + file {$client_body_temp_path: + ensure => directory, + owner => $daemon_user, + } } - - file {$proxy_temp_path: - ensure => directory, - owner => $daemon_user, + if $proxy_temp_path { + file {$proxy_temp_path: + ensure => directory, + owner => $daemon_user, + } } unless $confd_only { diff --git a/manifests/init.pp b/manifests/init.pp index c9de9a4c8..c8e7a28c2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -26,7 +26,7 @@ # } class nginx ( ### START Nginx Configuration ### - $client_body_temp_path = $nginx::params::client_body_temp_path, + Variant[Stdlib::Absolutepath, Boolean] $client_body_temp_path = $nginx::params::client_body_temp_path, Boolean $confd_only = false, Boolean $confd_purge = false, $conf_dir = $nginx::params::conf_dir, @@ -45,7 +45,7 @@ Variant[String, Array[String]] $nginx_error_log = "${log_dir}/${nginx::params::nginx_error_log_file}", Nginx::ErrorLogSeverity $nginx_error_log_severity = 'error', $pid = $nginx::params::pid, - $proxy_temp_path = $nginx::params::proxy_temp_path, + Variant[Stdlib::Absolutepath, Boolean] $proxy_temp_path = $nginx::params::proxy_temp_path, $root_group = $nginx::params::root_group, $run_dir = $nginx::params::run_dir, $sites_available_owner = $nginx::params::sites_available_owner,