Decommission lully.d.o

[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 614ef81..a0016ef 100644 (file)
--- a/modules/syslog_ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog_ng/templates/syslog-ng.conf.erb
@@ -124,7 +124,7 @@ source s_local {
 <%- end -%>
 };
 
-<%- if (@hostname == "lotti") || (@hostname == "lully") || (@hostname == "loghost-grnet-01") || (@hostname == "loghost-osuosl-01") -%>
+<%- if (@hostname == "lotti") || (@hostname == "loghost-grnet-01") || (@hostname == "loghost-osuosl-01") -%>
 source s_network {
        tcp6(port(5140) max-connections(400)
                tls( key_file("/etc/exim4/ssl/thishost.key")
@@ -418,16 +418,6 @@ destination loghost-lotti {
                     ca_dir("/etc/ssl/debian/certs/")
                )
        );
-};
- <%- end -%>
-  <%- if @hostname != "lully" -%>
-destination loghost-lully {
-       tcp("lully.debian.org" port (5140)
-               tls( key_file("/etc/ssl/private/thishost.key")
-                    cert_file("/etc/ssl/debian/certs/thishost.crt")
-                    ca_dir("/etc/ssl/debian/certs/")
-               )
-       );
 };
  <%- end -%>
   <%- if @hostname != "loghost-grnet-01" -%>
@@ -456,9 +446,6 @@ log {
  <%- if @hostname != "lotti" -%>
        destination(loghost-lotti);
  <%- end -%>
- <%- if @hostname != "lully" -%>
-       destination(loghost-lully);
- <%- end -%>
  <%- if @hostname != "loghost-grnet-01" -%>
        destination(loghost-loghost-grnet-01);
  <%- end -%>
@@ -469,7 +456,7 @@ log {
 
 
 
-<%- if (@hostname == "lotti") || (@hostname == "lully") || (@hostname == "loghost-grnet-01") || (@hostname == "loghost-osuosl-01") -%>
+<%- if (@hostname == "lotti") || (@hostname == "loghost-grnet-01") || (@hostname == "loghost-osuosl-01") -%>
 ###############################################################################
 ########## ON LOG HOST ########################################################
 ###############################################################################