X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=3de244eb3f7cc5d711cbcb9b68bcaf8f5e8e8848;hb=3a18a2560244c20c7aa4fa4b8378821318f22f6b;hp=55b27e20cff336b5f02c1effd01a097a0547288c;hpb=2998fda622b3c2eaf9e2e971d5753d0607a05513;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 55b27e20c..3de244eb3 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -37,14 +37,6 @@ if %w{geo1 geo2 geo3}.include?(hostname) then
 	ssh4allowed << '194.177.211.209' # orff - master
 	ssh6allowed << '2001:648:2ffc:deb:213:72ff:fe69:e188' # orff - master
 end
-if %w{pasquini tristano}.include?(hostname) then
-	ssh4allowed << '206.12.19.23'    # ganeti2.debian.org
-	ssh4allowed << '206.12.19.213'   # tristano.debian.org
-	ssh4allowed << '206.12.19.217'   # pasquini.debian.org
-	ssh4allowed << '192.168.2.23'    # ganeti2.debprivate-ubc.debian.org
-	ssh4allowed << '192.168.2.213'   # tristano-mnt.debprivate-ubc.debian.org
-	ssh4allowed << '192.168.2.217'   # pasquini-mnt.debprivate-ubc.debian.org
-end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
 ssh6allowed.length == 0 and ssh6allowed << '::/0'