diff options
-rw-r--r-- | manifests/init.pp | 1 | ||||
-rw-r--r-- | manifests/params.pp | 5 | ||||
-rw-r--r-- | templates/rsyslog.conf.erb | 3 |
3 files changed, 9 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 0976b1c..12a67ce 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -35,6 +35,7 @@ class rsyslog::params { $run_group = 'root' $log_group = 'adm' $log_style = 'debian' + $umask = false $perm_file = '0640' $perm_dir = '0755' $spool_dir = '/var/spool/rsyslog' @@ -111,6 +112,7 @@ class rsyslog::params { $run_group = 'root' $log_group = 'root' $log_style = 'redhat' + $umask = '0000' $perm_file = '0600' $perm_dir = '0750' $spool_dir = '/var/lib/rsyslog' @@ -134,6 +136,7 @@ class rsyslog::params { $run_group = 'root' $log_group = 'root' $log_style = 'debian' + $umask = false $perm_file = '0600' $perm_dir = '0750' $spool_dir = '/var/spool/rsyslog/' @@ -160,6 +163,7 @@ class rsyslog::params { $run_group = 'wheel' $log_group = 'wheel' $log_style = 'debian' + $umask = false $perm_file = '0640' $perm_dir = '0755' $spool_dir = '/var/spool/syslog' @@ -192,6 +196,7 @@ class rsyslog::params { $run_group = '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 9149122..406aa49 100644 --- a/templates/rsyslog.conf.erb +++ b/templates/rsyslog.conf.erb @@ -30,6 +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') %> |