Merge pull request voxpupuli#1251 from ekohl/optional-paths

Propery handle ${client_body,proxy}_temp_path
Rubueno · Oct 1, 2018 · a96e955 · a96e955
2 parents a0d34e7 + 507bc94
commit a96e955
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git 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
@@ -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,