summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Heiringhoff <ralf.heiringhoff@1und1.de>2012-09-04 15:23:38 +0200
committerRalf Heiringhoff <ralf.heiringhoff@1und1.de>2012-09-04 15:23:38 +0200
commitd29c3351dc7105c41a18767e72b541e30157e239 (patch)
treeb90dd41c85f7c514f5d9bdc383a64d6d8c941578
parentbddb3ca1a2c7d7033d28571824cf77c151e73f8c (diff)
Add Disk Spool Size Queueing Params
-rw-r--r--manifests/params.pp3
-rw-r--r--templates/client.conf.erb2
2 files changed, 4 insertions, 1 deletions
diff --git a/manifests/params.pp b/manifests/params.pp
index e2024c2..5e08812 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -15,6 +15,7 @@ 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"
@@ -34,6 +35,7 @@ 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"
@@ -53,6 +55,7 @@ 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 ffe5a8d..aa96cfe 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 1g # 1gb space limit (use as much as possible)
+$ActionQueueMaxDiskSpace <%= scope.lookupvar('rsyslog::params::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