X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog-ng%2Ftemplates%2Fsyslog-ng.conf.erb;h=546bf1cb5de0a3bcf4daeeb37c0e2461d629f2b7;hb=d28b594a6b6792f6e54e3ed3aa1ee8c0091ea387;hp=20f0cfc5e2678517586d480c441992ff65fecb16;hpb=e5f76fd35f65a175a2a5602948765dd47dc7c4c2;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 20f0cfc5e..546bf1cb5 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -91,6 +91,9 @@ options {
 	bad_hostname("^gconfd$");
 
 	keep_hostname(no);
+
+	# We believe our own clock more than we believe the client clock.
+	keep_timestamp(no);
 };
 
 
@@ -112,16 +115,11 @@ source s_local {
         # function to send logs to)
         unix-dgram("/var/run/log");
         # messages from the kernel
-        file("/dev/klog" program_override("kernel: "));
-<%- 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();
+        file("/dev/klog" program_override("kernel: ") follow-freq(1));
 <%- end -%>
 };
 
-<%- if (hostname == "heininen") || (hostname == "lotti") -%>
+<%- if (hostname == "lotti") || (hostname == "lully") -%>
 source s_network {
 	tcp6(port(5140) max-connections(200)
 		tls( key_file("/etc/exim4/ssl/thishost.key")
@@ -144,7 +142,7 @@ destination df_daemon { file("/var/log/daemon.log"); };
 destination df_kern { file("/var/log/kern.log"); };
 destination df_lpr { file("/var/log/lpr.log"); };
 destination df_mail { file("/var/log/mail.log" group(maillog)); };
-destination df_mail_info { file("/var/log/mail.info" group(maillog)); };
+# destination df_mail_info { file("/var/log/mail.info" group(maillog)); };
 destination df_mail_warn { file("/var/log/mail.warn" group(maillog)); };
 destination df_mail_err { file("/var/log/mail.err" group(maillog)); };
 destination df_user { file("/var/log/user.log" perm(0644)); };
@@ -310,12 +308,12 @@ log {
 };
 
 # mail.info                       -/var/log/mail.info
-log {
-        source(s_local);
-        filter(f_mail);
-        filter(f_at_least_info);
-        destination(df_mail_info);
-};
+#log {
+#        source(s_local);
+#        filter(f_mail);
+#        filter(f_at_least_info);
+#        destination(df_mail_info);
+#};
 
 # mail.warn                       -/var/log/mail.warn
 log {
@@ -399,9 +397,9 @@ log {
 <%- end -%>
 
 
-  <%- if hostname != "heininen" -%>
-destination loghost-heininen {
-	tcp("heininen.debian.org" port (5140)
+ <%- if hostname != "lotti" -%>
+destination loghost-lotti {
+	tcp("lotti.debian.org" port (5140)
 		tls( key_file("/etc/ssl/debian/keys/thishost.key")
 		     cert_file("/etc/ssl/debian/certs/thishost.crt")
 		     ca_dir("/etc/ssl/debian/certs/")
@@ -409,9 +407,9 @@ destination loghost-heininen {
 	);
 };
  <%- end -%>
- <%- if hostname != "lotti" -%>
-destination loghost-lotti {
-	tcp("lotti.debian.org" port (5140)
+  <%- if hostname != "lully" -%>
+destination loghost-lully {
+	tcp("lully.debian.org" port (5140)
 		tls( key_file("/etc/ssl/debian/keys/thishost.key")
 		     cert_file("/etc/ssl/debian/certs/thishost.crt")
 		     ca_dir("/etc/ssl/debian/certs/")
@@ -422,17 +420,17 @@ destination loghost-lotti {
 
 log {
 	source(s_local);
- <%- if hostname != "heininen" -%> 
-	destination(loghost-heininen);
- <%- end -%>
  <%- if hostname != "lotti" -%>
 	destination(loghost-lotti);
  <%- end -%>
+ <%- if hostname != "lully" -%>
+	destination(loghost-lully);
+ <%- end -%>
 };
 
 
 
-<%- if (hostname == "heininen") || (hostname == "lotti") -%>
+<%- if (hostname == "lotti") || (hostname == "lully") -%>
 ###############################################################################
 ########## ON LOG HOST ########################################################
 ###############################################################################