From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 27 Oct 2013 10:02:26 +0000 (+0100)
Subject: move tftp from paganini to jenkins.  no more dhcp at ubc for now
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=fc5dc8b2caf4786227377f0cab68974beedd04fe;hp=517e1e09bbe95c171100392a08c0354a65e781bb;p=mirror%2Fdsa-puppet.git

move tftp from paganini to jenkins.  no more dhcp at ubc for now
---

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 725fc6d26..74c001bdc 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -38,22 +38,22 @@ class ferm::per-host {
 				rule		=> 'destination 78.8.208.246/32 proto tcp dport 25 jump DROP',
 			}
 		}
-		abel,alwyn,rietz: {
-			@ferm::rule { 'dsa-tftp':
-				description     => 'Allow tftp access',
-				rule            => '&SERVICE(udp, 69)'
-			}
-		}
-		paganini: {
-			@ferm::rule { 'dsa-dhcp':
-				description     => 'Allow dhcp access',
-				rule            => '&SERVICE(udp, 67)'
-			}
+		abel,alwyn,rietz,jenkins: {
 			@ferm::rule { 'dsa-tftp':
 				description     => 'Allow tftp access',
 				rule            => '&SERVICE(udp, 69)'
 			}
 		}
+		#paganini: {
+		#	@ferm::rule { 'dsa-dhcp':
+		#		description     => 'Allow dhcp access',
+		#		rule            => '&SERVICE(udp, 67)'
+		#	}
+		#	@ferm::rule { 'dsa-tftp':
+		#		description     => 'Allow tftp access',
+		#		rule            => '&SERVICE(udp, 69)'
+		#	}
+		#}
 		lotti,lully: {
 			@ferm::rule { 'dsa-syslog':
 				description     => 'Allow syslog access',