summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-09-30 10:40:28 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-09-30 10:40:28 -0300
commitdce7d7801c28b7bc0c426bef94d52b68cce2267a (patch)
tree8b4574b0bd89886c28801a082ec0b983c41f951d
parentdc042b3e867a14d42597502eff9f4089c74780c8 (diff)
downloadpuppet-syslog-ng-dce7d7801c28b7bc0c426bef94d52b68cce2267a.tar.gz
puppet-syslog-ng-dce7d7801c28b7bc0c426bef94d52b68cce2267a.tar.bz2
Managing /etc/default/syslog-ng
-rw-r--r--files/default15
-rw-r--r--manifests/vserver.pp12
2 files changed, 27 insertions, 0 deletions
diff --git a/files/default b/files/default
new file mode 100644
index 0000000..6c7b14a
--- /dev/null
+++ b/files/default
@@ -0,0 +1,15 @@
+# If a variable is not set here, then the corresponding
+# parameter will not be changed.
+# If a variables is set, then every invocation of
+# syslog-ng's init script will set them using dmesg.
+
+# log level of messages which should go to console
+# see <linux/kernel.h> for details
+#
+#CONSOLE_LOG_LEVEL=1
+
+# Command line options to syslog-ng
+#SYSLOGNG_OPTS="--no-caps"
+
+# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625488
+SYSLOGNG_OPTS="--fd-limit 1024"
diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index 238c4c2..baf368a 100644
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -14,4 +14,16 @@ class syslog-ng::vserver {
ensure => present,
source => "puppet://$server/modules/syslog-ng/logrotate",
}
+
+ # Manage this file due to
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625488
+ # TODO: restore the original file after the issue is solved.
+ file { "/etc/default/syslog-ng":
+ owner => "root",
+ group => "root",
+ mode => 0644,
+ ensure => present,
+ source => "puppet://$server/modules/syslog-ng/default",
+ notify => Service["syslog-ng"],
+ }
}