From a726b4045442fe2219353fb983d650fcd94b13be Mon Sep 17 00:00:00 2001 From: Mathieu Bornoz Date: Mon, 29 Apr 2013 12:33:46 +0200 Subject: rsyslog: make all module params configurable + support false for *_package_name variables. This is useful if relp support is not necessary as it happens that no packages exist for RedHat < 6. All these changes should be fully backward compatible. --- templates/client.conf.erb | 10 +++++----- templates/rsyslog.conf.erb | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'templates') diff --git a/templates/client.conf.erb b/templates/client.conf.erb index 9b6321b..e5dfb8c 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -1,7 +1,7 @@ # file is managed by puppet # An "In-Memory Queue" is created for remote logging. -$WorkDirectory <%= scope.lookupvar('rsyslog::params::spool_dir') -%> # where to place spool files +$WorkDirectory <%= scope.lookupvar('rsyslog::spool_dir') -%> # where to place spool files $ActionQueueFileName queue # unique name prefix for spool files $ActionQueueMaxDiskSpace <%= scope.lookupvar('rsyslog::client::spool_size') -%> # spool space limit (use as much as possible) $ActionQueueSaveOnShutdown on # save messages to disk on shutdown @@ -21,17 +21,17 @@ $ActionResumeRetryCount -1 # infinety retries if host is down # We log locally, restore to default format $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat -<% if scope.lookupvar('rsyslog::params::log_style') == 'debian' -%> +<% if scope.lookupvar('rsyslog::log_style') == 'debian' -%> # Log auth messages locally auth,authpriv.* /var/log/auth.log -<% elsif scope.lookupvar('rsyslog::params::log_style') == 'redhat' -%> +<% elsif scope.lookupvar('rsyslog::log_style') == 'redhat' -%> # Log auth messages locally auth,authpriv.* /var/log/secure <% end -%> <% end -%> <% if scope.lookupvar('rsyslog::client::log_local') -%> -<% if scope.lookupvar('rsyslog::params::log_style') == 'debian' -%> +<% if scope.lookupvar('rsyslog::log_style') == 'debian' -%> # First some standard log files. Log by facility. # *.*;auth,authpriv.none -/var/log/syslog @@ -89,7 +89,7 @@ daemon.*;mail.*;\ news.err;\ *.=debug;*.=info;\ *.=notice;*.=warn |/dev/xconsole -<% elsif scope.lookupvar('rsyslog::params::log_style') == 'redhat' -%> +<% elsif scope.lookupvar('rsyslog::log_style') == 'redhat' -%> # Log all kernel messages to the console. # Logging much else clutters up the screen. #kern.* /dev/console diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb index dd7e259..0192845 100644 --- a/templates/rsyslog.conf.erb +++ b/templates/rsyslog.conf.erb @@ -15,17 +15,17 @@ $ModLoad imklog # provides kernel logging support (previously done by rklogd) # # Set the default permissions for all log files. # -$FileOwner <%= scope.lookupvar('rsyslog::params::log_user') %> -$FileGroup <%= scope.lookupvar('rsyslog::params::log_group') %> -$FileCreateMode <%= scope.lookupvar('rsyslog::params::perm_file') %> -$DirCreateMode <%= scope.lookupvar('rsyslog::params::perm_dir') %> -$PrivDropToUser <%= scope.lookupvar('rsyslog::params::run_user') %> -$PrivDropToGroup <%= scope.lookupvar('rsyslog::params::run_group') %> +$FileOwner <%= scope.lookupvar('rsyslog::log_user') %> +$FileGroup <%= scope.lookupvar('rsyslog::log_group') %> +$FileCreateMode <%= scope.lookupvar('rsyslog::perm_file') %> +$DirCreateMode <%= scope.lookupvar('rsyslog::perm_dir') %> +$PrivDropToUser <%= scope.lookupvar('rsyslog::run_user') %> +$PrivDropToGroup <%= scope.lookupvar('rsyslog::run_group') %> # -# Include all config files in <%= scope.lookupvar('rsyslog::params::rsyslog_d') %> +# Include all config files in <%= scope.lookupvar('rsyslog::rsyslog_d') %> # -$IncludeConfig <%= scope.lookupvar('rsyslog::params::rsyslog_d') -%>*.conf +$IncludeConfig <%= scope.lookupvar('rsyslog::rsyslog_d') -%>*.conf # # Emergencies are sent to everybody logged in. -- cgit v1.2.3