From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 16 May 2012 11:11:52 +0000 (+0200)
Subject: Replace heininen with lully
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1225982b1493713085288aa1a3b87c98f68a1d60;p=mirror%2Fdsa-puppet.git

Replace heininen with lully
---

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 82f9eb8e7..13980a162 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -51,7 +51,7 @@ class ferm::per-host {
 				rule            => 'proto tcp dport 8000:8100 jump ACCEPT'
 			}
 		}
-		heininen,lotti: {
+		lotti,lully: {
 			@ferm::rule { 'dsa-syslog':
 				description     => 'Allow syslog access',
 				rule            => '&SERVICE_RANGE(tcp, 5140, $HOST_DEBIAN_V4)'
diff --git a/modules/syslog-ng/templates/syslog-ng.conf.erb b/modules/syslog-ng/templates/syslog-ng.conf.erb
index 60ac374ef..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")
@@ -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 ########################################################
 ###############################################################################