X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog-ng%2Ftemplates%2Fsyslog-ng.conf.erb;h=20f0cfc5e2678517586d480c441992ff65fecb16;hb=3d2ebaca028f10080d65b693418fcded8d62ccb6;hp=6e09b0323db75ff9d1a95b2a69d8aaa6114c88f3;hpb=7dde3742137f448e38c08994df19f9f8eafa61c5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/syslog-ng/templates/syslog-ng.conf.erb b/modules/syslog-ng/templates/syslog-ng.conf.erb
index 6e09b0323..20f0cfc5e 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -1,6 +1,9 @@
-<%- if has_variable?("syslogversion") and syslogversion.to_s == "3" -%>
+<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
 @version: 3.0
 <%- end -%>
+<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.3" -%>
+@version: 3.3
+<%- end -%>
 ##
 ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
@@ -42,7 +45,12 @@ options {
         #sync(0);
 
         # the number of lines fitting in the output queue
+<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
         log_fifo_size(2048);
+<%- end -%>
+<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.3" -%>
+        log_fifo_size(10000);
+<%- end -%>
 
         # enable or disable directory creation for destination files
         create_dirs(yes);
@@ -82,11 +90,7 @@ options {
 	# is not a real hostname.
 	bad_hostname("^gconfd$");
 
-<%- if (hostname == "heininen") || (hostname == "lotti") -%>
-	# we trust our mutual authenticated syslog clients
-	keep_hostname(yes);
-<%- end -%>
-
+	keep_hostname(no);
 };
 
 
@@ -102,22 +106,14 @@ source s_local {
         # function to send logs to)
         unix-stream("/dev/log");
         # messages from the kernel
-<%- if has_variable?("syslogversion") and syslogversion.to_s == "2" -%>
-        file("/proc/kmsg" log_prefix("kernel: "));
-<%- else -%>
         file("/proc/kmsg" program_override("kernel: "));
-<%- end -%>
 <%- else -%>
         # standard Linux log source (this is the default place for the syslog()
         # function to send logs to)
         unix-dgram("/var/run/log");
         # messages from the kernel
-<%- if has_variable?("syslogversion") and syslogversion.to_s == "2" -%>
-        file("/dev/klog" log_prefix("kernel: "));
-<%- else -%>
         file("/dev/klog" program_override("kernel: "));
 <%- end -%>
-<%- end -%>
 <%- if hostname == "paganini" -%>
         # use the following line if you want to receive remote UDP logging messages
         # (this is equivalent to the "-r" syslogd flag)
@@ -403,7 +399,6 @@ log {
 <%- end -%>
 
 
-<%- if has_variable?("syslogversion") and syslogversion.to_s == "3" -%>
   <%- if hostname != "heininen" -%>
 destination loghost-heininen {
 	tcp("heininen.debian.org" port (5140)
@@ -434,7 +429,6 @@ log {
 	destination(loghost-lotti);
  <%- end -%>
 };
-<%- end -%>