Merge pull request #1393 from triforce/add_global_mode_to_all_files

Ensured file mode permissions are more consistent
voxpupuli · Jun 30, 2020 · e4ba3e0 · e4ba3e0
2 parents e4e3650 + fe09df3
commit e4ba3e0
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/manifests/resource/geo.pp b/manifests/resource/geo.pp
@@ -78,7 +78,7 @@
   File {
     owner => 'root',
     group => $root_group,
-    mode  => '0644',
+    mode  => $nginx::global_mode,
   }
 
   file { "${conf_dir}/${name}-geo.conf":

diff --git a/manifests/resource/location.pp b/manifests/resource/location.pp
@@ -268,7 +268,7 @@
   File {
     owner  => 'root',
     group  => $root_group,
-    mode   => '0644',
+    mode   => $nginx::global_mode,
     notify => Class['::nginx::service'],
   }
 
@@ -299,15 +299,15 @@
   ) {
     file { $fastcgi_params:
       ensure  => 'present',
-      mode    => '0644',
+      mode    => $nginx::global_mode,
       content => template('nginx/server/fastcgi.conf.erb'),
     }
   }
 
   if $ensure == 'present' and $uwsgi != undef and !defined(File[$uwsgi_params]) and $uwsgi_params == "${nginx::conf_dir}/uwsgi_params" {
     file { $uwsgi_params:
       ensure  => 'present',
-      mode    => '0644',
+      mode    => $nginx::global_mode,
       content => template('nginx/server/uwsgi_params.erb'),
     }
   }

diff --git a/manifests/resource/mailhost.pp b/manifests/resource/mailhost.pp
@@ -132,7 +132,7 @@
   File {
     owner => 'root',
     group => $root_group,
-    mode  => '0644',
+    mode  => $nginx::global_mode,
   }
 
   $config_dir  = "${nginx::conf_dir}/conf.mail.d"
@@ -154,7 +154,7 @@
   concat { $config_file:
     owner   => 'root',
     group   => $root_group,
-    mode    => '0644',
+    mode    => $nginx::global_mode,
     notify  => Class['::nginx::service'],
     require => File[$config_dir],
   }

diff --git a/manifests/resource/map.pp b/manifests/resource/map.pp
@@ -100,7 +100,7 @@
   File {
     owner => 'root',
     group => $root_group,
-    mode  => '0644',
+    mode  => $nginx::global_mode,
   }
 
   file { "${conf_dir}/${name}-map.conf":

diff --git a/manifests/resource/server.pp b/manifests/resource/server.pp
@@ -435,15 +435,15 @@
   if $fastcgi != undef and !defined(File[$fastcgi_params]) and $fastcgi_params == "${nginx::conf_dir}/fastcgi.conf" {
     file { $fastcgi_params:
       ensure  => present,
-      mode    => '0644',
+      mode    => $nginx::global_mode,
       content => template('nginx/server/fastcgi.conf.erb'),
     }
   }
 
   if $uwsgi != undef and !defined(File[$uwsgi_params]) and $uwsgi_params == "${nginx::conf_dir}/uwsgi_params" {
     file { $uwsgi_params:
       ensure  => present,
-      mode    => '0644',
+      mode    => $nginx::global_mode,
       content => template('nginx/server/uwsgi_params.erb'),
     }
   }

diff --git a/manifests/resource/upstream.pp b/manifests/resource/upstream.pp
@@ -116,7 +116,7 @@
   Concat {
     owner => 'root',
     group => $nginx::root_group,
-    mode  => '0644',
+    mode  => $nginx::global_mode,
   }
 
   concat { "${conf_dir}/${name}-upstream.conf":