X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog-ng%2Ftemplates%2Fsyslog-ng.conf.erb;h=f2486d7eb69e4abe4ee6b4dfb45abca2613a9521;hb=59db766085de4e5d635cc5f6145c94c6d5cab2dd;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..f2486d7eb 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -121,7 +121,7 @@ source s_local {
 <%- 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 +144,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 +310,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 +399,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 +409,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 +422,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 ########################################################
 ###############################################################################