- ssh4allowed << %w{$DSA_IPS $HOST_NAGIOS_V4 $HOST_DB_V4}
- ssh6allowed << %w{$DSA_V6_IPS $HOST_NAGIOS_V6 $HOST_DB_V6}
-end
-if %w{lebrun schroeder}.include?(hostname) then
- out << '@def $CARNET = ( 193.198.184.8/29 161.53.160.133 161.53.160.90 161.53.11.222 161.53.12.134 161.53.12.142 161.53.12.143 );'
- ssh4allowed << '$CARNET'
- ssh4allowed << '$BUILDD_SSH_ACCESS'
-end
-if %w{beethoven draghi}.include?(hostname) then
- ssh4allowed << '$HOST_DEBIAN_V4'
- ssh6allowed << '$HOST_DEBIAN_V6'
-end
-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.debprivate-ubc.debian.org
- ssh4allowed << '192.168.2.213' # pasquini.debprivate-ubc.debian.org
+ ssh4allowed << %w{$DSA_IPS $HOST_NAGIOS_V4 $HOST_MUNIN_V4 $HOST_DB_V4}
+ ssh6allowed << %w{$DSA_V6_IPS $HOST_NAGIOS_V6 $HOST_MUNIN_V6 $HOST_DB_V6}
+
+ if %w{lebrun schroeder}.include?(hostname) then
+ out << '@def $CARNET = ( 193.198.184.8/29 161.53.160.133 161.53.160.90 161.53.11.222 161.53.12.134 161.53.12.142 161.53.12.143 );'
+ ssh4allowed << '$CARNET'
+ ssh4allowed << '$BUILDD_SSH_ACCESS'
+ end
+ if %w{beethoven draghi}.include?(hostname) then
+ ssh4allowed << '$HOST_DEBIAN_V4'
+ ssh6allowed << '$HOST_DEBIAN_V6'
+ end
+
+ if %w{adayevskaya}.include?(hostname) then
+ ssh4allowed << %w{$HOST_MAILRELAY_V4}
+ ssh6allowed << %w{$HOST_MAILRELAY_V6}
+ end
+
+ if nodeinfo['static_master'] then
+ ssh4allowed << '$HOST_STATIC_V4'
+ ssh6allowed << '$HOST_STATIC_V6'
+ elsif nodeinfo['static_source'] or nodeinfo['static_mirror'] then
+ ssh4allowed << '$HOST_STATICMASTER_V4'
+ ssh6allowed << '$HOST_STATICMASTER_V6'
+ end