diff options
-rw-r--r-- | manifests/client.pp | 1 | ||||
-rw-r--r-- | manifests/params.pp | 3 | ||||
-rw-r--r-- | templates/client.conf.erb | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index bedf1f6..fd76f1e 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -1,5 +1,6 @@ class rsyslog::client ( $log_remote = true, + $spool_size = '1g', $remote_type = 'tcp', $log_local = false, $log_auth_local = false, diff --git a/manifests/params.pp b/manifests/params.pp index beac031..edf0bc1 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -15,7 +15,6 @@ class rsyslog::params { $perm_file = '0640' $perm_dir = '0755' $spool_dir = '/var/spool/rsyslog/' - $spool_size = '1g' $service_name = 'rsyslog' $client_conf = "${rsyslog_d}client.conf" $server_conf = "${rsyslog_d}server.conf" @@ -35,7 +34,6 @@ class rsyslog::params { $perm_file = '0600' $perm_dir = '0750' $spool_dir = '/var/lib/rsyslog/' - $spool_size = '1g' $service_name = 'rsyslog' $client_conf = "${rsyslog_d}client.conf" $server_conf = "${rsyslog_d}server.conf" @@ -55,7 +53,6 @@ class rsyslog::params { $perm_file = '0640' $perm_dir = '0755' $spool_dir = '/var/spool/syslog/' - $spool_size = '1g' $service_name = 'syslogd' $client_conf = "${rsyslog_d}client.conf" $server_conf = "${rsyslog_d}server.conf" diff --git a/templates/client.conf.erb b/templates/client.conf.erb index 38af6af..9b6321b 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -3,7 +3,7 @@ # An "In-Memory Queue" is created for remote logging. $WorkDirectory <%= scope.lookupvar('rsyslog::params::spool_dir') -%> # where to place spool files $ActionQueueFileName queue # unique name prefix for spool files -$ActionQueueMaxDiskSpace <%= scope.lookupvar('rsyslog::params::spool_size') -%> # spool space limit (use as much as possible) +$ActionQueueMaxDiskSpace <%= scope.lookupvar('rsyslog::client::spool_size') -%> # spool space limit (use as much as possible) $ActionQueueSaveOnShutdown on # save messages to disk on shutdown $ActionQueueType LinkedList # run asynchronously $ActionResumeRetryCount -1 # infinety retries if host is down |