X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=3de244eb3f7cc5d711cbcb9b68bcaf8f5e8e8848;hb=ed99f27a1a047466ef2f0fa56ae42640a3a78fec;hp=32c62e3bb5befb6c32be2c00c9fa25d352bc0439;hpb=99df906318a8a9d9d1892cfef5eedf686e3b8de8;p=dsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 32c62e3b..3de244eb 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -7,7 +7,7 @@
 out = []
 
 restricted_purposes = {'kvm host', 'central syslog server', 'puppet master', 'jumphost'}
-restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 beethoven tchaikovsky schroeder rossini draghi}
+restrict_ssh = %w{lebrun geo1 geo2 geo3 beethoven tchaikovsky schroeder rossini draghi}
 
 if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose')) then
 	scope.lookupvar('site::nodeinfo')['ldap']['purpose'].each do |purp|
@@ -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'