Managing /etc/default/syslog-ng

diff --git a/files/default b/files/default
new file mode 100644 (file)
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 238c4c27fd24a199bcb15650d4b7990dec7abebd..baf368a263832521092771293a0b67cb8ecede34 100644 (file)
--- 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"],
+  }
 }