Added daemon_user as a parameter.

cegeka · Jun 4, 2014 · b41f242 · b41f242
1 parent 8906c9a
commit b41f242
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -18,6 +18,7 @@
   $client_max_body_size           = $nginx::params::nx_client_max_body_size,
   $confd_purge                    = $nginx::params::nx_confd_purge,
   $conf_template                  = $nginx::params::nx_conf_template,
+  $daemon_user                    = $nginx::params::nx_daemon_user,
   $events_use                     = $nginx::params::nx_events_use,
   $fastcgi_cache_inactive         = $nginx::params::nx_fastcgi_cache_inactive,
   $fastcgi_cache_key              = $nginx::params::nx_fastcgi_cache_key,
@@ -102,12 +103,12 @@
 
   file {$nginx::config::nx_client_body_temp_path:
     ensure => directory,
-    owner  => $nginx::params::nx_daemon_user,
+    owner  => $daemon_user,
   }
 
   file {$nginx::config::nx_proxy_temp_path:
     ensure => directory,
-    owner  => $nginx::params::nx_daemon_user,
+    owner  => $daemon_user,
   }
 
   file { "${nginx::params::nx_conf_dir}/sites-available":

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -34,6 +34,7 @@
   $confd_purge                    = $nginx::params::nx_confd_purge,
   $configtest_enable              = $nginx::params::nx_configtest_enable,
   $conf_template                  = $nginx::params::nx_conf_template,
+  $daemon_user                    = $nginx::params::nx_daemon_user,
   $events_use                     = $nginx::params::nx_events_use,
   $fastcgi_cache_inactive         = $nginx::params::nx_fastcgi_cache_inactive,
   $fastcgi_cache_key              = $nginx::params::nx_fastcgi_cache_key,
@@ -170,6 +171,7 @@
     client_max_body_size           => $client_max_body_size,
     confd_purge                    => $confd_purge,
     conf_template                  => $conf_template,
+    daemon_user                    => $daemon_user,
     events_use                     => $events_use,
     fastcgi_cache_inactive         => $fastcgi_cache_inactive,
     fastcgi_cache_key              => $fastcgi_cache_key,

diff --git a/manifests/resource/vhost.pp b/manifests/resource/vhost.pp
@@ -504,32 +504,32 @@
     # Check if the file has been defined before creating the file to
     # avoid the error when using wildcard cert on the multiple vhosts
     ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.crt", {
-      owner  => $nginx::params::nx_daemon_user,
+      owner  => $nginx::config::daemon_user,
       mode   => '0444',
       source => $ssl_cert,
     })
     ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.key", {
-      owner  => $nginx::params::nx_daemon_user,
+      owner  => $nginx::config::daemon_user,
       mode   => '0440',
       source => $ssl_key,
     })
     if ($ssl_dhparam != undef) {
       ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.dh.pem", {
-        owner  => $nginx::params::nx_daemon_user,
+        owner  => $nginx::config::daemon_user,
         mode   => '0440',
         source => $ssl_dhparam,
       })
     }
     if ($ssl_stapling_file != undef) {
       ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.ocsp.resp", {
-        owner  => $nginx::params::nx_daemon_user,
+        owner  => $nginx::config::daemon_user,
         mode   => '0440',
         source => $ssl_stapling_file,
       })
     }
     if ($ssl_trusted_cert != undef) {
       ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.trusted.crt", {
-        owner  => $nginx::params::nx_daemon_user,
+        owner  => $nginx::config::daemon_user,
         mode   => '0440',
         source => $ssl_trusted_cert,
       })