update arch all buildd hostname

[mirror/dsa-puppet.git] / modules / syslog-ng / templates / syslog-ng.conf.erb

diff --git a/modules/syslog-ng/templates/syslog-ng.conf.erb b/modules/syslog-ng/templates/syslog-ng.conf.erb
index 53ce00d..c2278e3 100644 (file)
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -1,7 +1,6 @@
 <%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
 @version: 3.0
-<%- end -%>
-<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.3" -%>
+<%- else -%>
 @version: 3.3
 <%- end -%>
 ##
@@ -47,8 +46,7 @@ options {
         # 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" -%>
+<%- else -%>
         log_fifo_size(10000);
 <%- end -%>
 
@@ -117,11 +115,6 @@ source s_local {
         # messages from the kernel
         file("/dev/klog" program_override("kernel: ") follow-freq(1));
 <%- 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)
-        udp();
-<%- end -%>
 };
 
 <%- if (hostname == "lotti") || (hostname == "lully") -%>