diff options
| author | Steffen Zieger <me@saz.sh> | 2014-09-10 18:18:48 +0200 |
|---|---|---|
| committer | Steffen Zieger <me@saz.sh> | 2014-09-10 18:18:48 +0200 |
| commit | 3aaa0bc69443a3809e984c10719264af2a48aec0 (patch) | |
| tree | 78d42b49e60d03a1d489918489b21334985b3a0b | |
| parent | c3b565697ffb4be7b708b65948abc02ae3b4a7ce (diff) | |
set umask only on systems where it is required
| -rw-r--r-- | manifests/params.pp | 4 | ||||
| -rw-r--r-- | templates/rsyslog.conf.erb | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/manifests/params.pp b/manifests/params.pp index 0519037..4ae378f 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -33,6 +33,7 @@ class rsyslog::params { $log_user = 'root' $log_group = 'adm' $log_style = 'debian' + $umask = false $perm_file = '0640' $perm_dir = '0755' $spool_dir = '/var/spool/rsyslog' @@ -142,6 +143,7 @@ class rsyslog::params { $log_user = 'root' $log_group = 'root' $log_style = 'debian' + $umask = false $perm_file = '0600' $perm_dir = '0750' $spool_dir = '/var/spool/rsyslog/' @@ -172,6 +174,7 @@ class rsyslog::params { $log_user = 'root' $log_group = 'wheel' $log_style = 'debian' + $umask = false $perm_file = '0640' $perm_dir = '0755' $spool_dir = '/var/spool/syslog' @@ -209,6 +212,7 @@ class rsyslog::params { $log_user = 'root' $log_group = 'adm' $log_style = 'debian' + $umask = false $perm_file = '0640' $perm_dir = '0755' $spool_dir = '/var/spool/rsyslog' diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb index f024569..406aa49 100644 --- a/templates/rsyslog.conf.erb +++ b/templates/rsyslog.conf.erb @@ -30,7 +30,9 @@ $DirGroup <%= scope.lookupvar('rsyslog::log_group') %> $DirCreateMode <%= scope.lookupvar('rsyslog::perm_dir') %> $PrivDropToUser <%= scope.lookupvar('rsyslog::run_user') %> $PrivDropToGroup <%= scope.lookupvar('rsyslog::run_group') %> +<% if scope.lookupvar('rsyslog::umask') -%> $Umask <%= scope.lookupvar('rsyslog::umask') %> +<% end -%> # # Include all config files in <%= scope.lookupvar('rsyslog::rsyslog_d') %> |