diff options
| author | Steffen Zieger <me@saz.sh> | 2014-09-10 18:12:24 +0200 |
|---|---|---|
| committer | Steffen Zieger <me@saz.sh> | 2014-09-10 18:12:24 +0200 |
| commit | c3b565697ffb4be7b708b65948abc02ae3b4a7ce (patch) | |
| tree | 82ef43c909af28fa562a86115bf09881a8d2fe6e | |
| parent | a403c09e75ed7e50497b6ccf467dc50c63244942 (diff) | |
| parent | fae89b62ac7d7cd24a5e2eb59e6c44f052476327 (diff) | |
Merge pull request #93 from mkrakowitzer/umask
Fix Issue #92 setting the perm_file => '0640', and perm_dir => '0750', params do not take effect.
| -rw-r--r-- | manifests/init.pp | 1 | ||||
| -rw-r--r-- | manifests/params.pp | 1 | ||||
| -rw-r--r-- | templates/rsyslog.conf.erb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 5115674..76d6102 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -28,6 +28,7 @@ class rsyslog ( $log_user = $rsyslog::params::log_user, $log_group = $rsyslog::params::log_group, $log_style = $rsyslog::params::log_style, + $umask = $rsyslog::params::umask, $perm_file = $rsyslog::params::perm_file, $perm_dir = $rsyslog::params::perm_dir, $spool_dir = $rsyslog::params::spool_dir, diff --git a/manifests/params.pp b/manifests/params.pp index 9027836..0519037 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -114,6 +114,7 @@ class rsyslog::params { $log_user = 'root' $log_group = 'root' $log_style = 'redhat' + $umask = '0000' $perm_file = '0600' $perm_dir = '0750' $spool_dir = '/var/lib/rsyslog' diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb index 9149122..f024569 100644 --- a/templates/rsyslog.conf.erb +++ b/templates/rsyslog.conf.erb @@ -30,6 +30,7 @@ $DirGroup <%= scope.lookupvar('rsyslog::log_group') %> $DirCreateMode <%= scope.lookupvar('rsyslog::perm_dir') %> $PrivDropToUser <%= scope.lookupvar('rsyslog::run_user') %> $PrivDropToGroup <%= scope.lookupvar('rsyslog::run_group') %> +$Umask <%= scope.lookupvar('rsyslog::umask') %> # # Include all config files in <%= scope.lookupvar('rsyslog::rsyslog_d') %> |