Replace heininen with lully

[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 60ac374..f2486d7 100644 (file)
--- 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")
@@ -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 ########################################################
 ###############################################################################