diff options
author | Steffen Zieger <me@saz.sh> | 2013-05-10 05:26:58 -0700 |
---|---|---|
committer | Steffen Zieger <me@saz.sh> | 2013-05-10 05:26:58 -0700 |
commit | 962798488db91310b11b257c0c8b797c0236380d (patch) | |
tree | 712a67b57d5b380cb8fe1a0a6062e063ac575a20 /templates/client.conf.erb | |
parent | 08c49965861137ae79620c7ca82af572f0ef024f (diff) | |
parent | 5c4812a4f44417d398ccc39cb28593b3df3ab9f4 (diff) |
Merge pull request #30 from mbornoz/improvements
Improvements
Diffstat (limited to 'templates/client.conf.erb')
-rw-r--r-- | templates/client.conf.erb | 10 |
1 files changed, 5 insertions, 5 deletions
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 |