add master to carnet hosts

[dsa-puppet.git] / modules / ferm / templates / me.conf.erb

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 87e0b40075ad8ab02c985214940cd6a37f196676..3018fb531c5ea51352193bad626e8b8b07ac0514 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -20,7 +20,8 @@ if %w{lebrun schroeder}.include?(hostname) then
        out << '@def $KIBI = ( 88.164.242.219 );'
        ssh4allowed << '$CARNET'
        ssh4allowed << '$KIBI'
-       ssh4allowed << '82.195.75.84' # nott.ayous.org, HE (builddadm)
+       ssh4allowed << '70.103.162.29' # master
+       ssh4allowed << '82.195.75.84'  # nott.ayous.org, HE (builddadm)
 end
 if %w{bartok beethoven}.include?(hostname) then
        ssh4allowed << '$HOST_DEBIAN_V4'
@@ -32,10 +33,8 @@ ssh6allowed.length == 0 and ssh6allowed << '::/0'
 out << "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});"
 out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
 
-if %w{cilea}.include?(hostname) then
-       out << '@hook pre "/sbin/modprobe nf_conntrack_sip";'
-       out << '@hook pre "/sbin/modprobe nf_conntrack_h323";'
-end
+
+
 
 smtp4allowed = []
 smtp6allowed = []