proto (tcp udp) mod state state (NEW) dport $port ACCEPT;
}
+@def &TCP_UDP_SERVICE_RANGE($port, $srange) = {
+ proto (tcp udp) mod state state (NEW) dport $port @subchain "$port" { saddr ($srange) ACCEPT; }"
+}
+
@def $HOST_MAILRELAY_V4 = (<%=
mailrelay = []
localinfo.keys.sort.each do |node|
if localinfo[node]['mailrelay']
- keyinfo[node]['ipHostNumber'].each do |ip|
+ allnodeinfo[node]['ipHostNumber'].each do |ip|
next if ip =~ /:/
mailrelay << ip
end
mailrelay = []
localinfo.keys.sort.each do |node|
if localinfo[node]['mailrelay']
- keyinfo[node]['ipHostNumber'].each do |ip|
+ allnodeinfo[node]['ipHostNumber'].each do |ip|
next if ip =~ /\./
mailrelay << ip
end
nagii = []
localinfo.keys.sort.each do |node|
if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
- keyinfo[node]['ipHostNumber'].each do |ip|
+ allnodeinfo[node]['ipHostNumber'].each do |ip|
next if ip =~ /:/
nagii << ip
end
nagii = []
localinfo.keys.sort.each do |node|
if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
- keyinfo[node]['ipHostNumber'].each do |ip|
+ allnodeinfo[node]['ipHostNumber'].each do |ip|
next if ip =~ /\./
nagii << ip
end
munins = []
localinfo.keys.sort.each do |node|
if localinfo[node]['muninmaster']
- keyinfo[node]['ipHostNumber'].each do |ip|
+ allnodeinfo[node]['ipHostNumber'].each do |ip|
next if ip =~ /:/
munins << ip
end
munins = []
localinfo.keys.sort.each do |node|
if localinfo[node]['muninmaster']
- keyinfo[node]['ipHostNumber'].each do |ip|
+ allnodeinfo[node]['ipHostNumber'].each do |ip|
next if ip =~ /\./
munins << ip
end
dbs = []
localinfo.keys.sort.each do |node|
if localinfo[node]['dbmaster']
- keyinfo[node]['ipHostNumber'].each do |ip|
+ allnodeinfo[node]['ipHostNumber'].each do |ip|
next if ip =~ /\./
dbs << ip
end
dbs = []
localinfo.keys.sort.each do |node|
if localinfo[node]['dbmaster']
- keyinfo[node]['ipHostNumber'].each do |ip|
+ allnodeinfo[node]['ipHostNumber'].each do |ip|
next if ip =~ /:/
dbs << ip
end
@def $HOST_DEBIAN_V4 = (<%=
dbs = []
- keyinfo.keys.sort.each do |node|
- next unless keyinfo[node].has_key?('ipHostNumber')
- keyinfo[node]['ipHostNumber'].each do |ip|
+ allnodeinfo.keys.sort.each do |node|
+ next unless allnodeinfo[node].has_key?('ipHostNumber')
+ allnodeinfo[node]['ipHostNumber'].each do |ip|
next if ip =~ /:/
dbs << ip
end
@def $HOST_DEBIAN_V6 = (<%=
dbs = []
- keyinfo.keys.sort.each do |node|
- next unless keyinfo[node].has_key?('ipHostNumber')
- keyinfo[node]['ipHostNumber'].each do |ip|
+ allnodeinfo.keys.sort.each do |node|
+ next unless allnodeinfo[node].has_key?('ipHostNumber')
+ allnodeinfo[node]['ipHostNumber'].each do |ip|
next if ip =~ /\./
dbs << ip
end
@def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
@def $sgran = (91.103.132.24/29 85.158.45.51/32);
+@def $sgran = ($sgran 94.195.192.0/19); # Temporarily on O2 ADSL
@def $weasel = ();
@def $weasel = ($weasel 86.59.118.144/28); # debian@sil
@def $weasel = ($weasel 86.59.21.32/29); # anguilla1
@def $weasel = ($weasel 86.59.30.32/28); # anguilla2
@def $weasel = ($weasel 141.201.27.0/24); # came
-@def $weasel = ($weasel 62.99.152.178); # argos.campus-sbg
+@def $weasel = ($weasel 62.99.152.176/28); # campus sbg
@def $zobel = ();
@def $zobel = ($zobel 87.139.82.80/32); # exit.credativ.com
@def $zobel = ($zobel 87.193.134.192/27); # credativ qsc
@def $zobel = ($zobel 78.47.2.104/29); # baldur, bragi, saga
-@def $luca = ();
+@def $luca = (64.71.152.109);
@def $DSA_IPS = ($sgran $weasel $zobel $luca);
@def $sgran6 = (2001:4b10:100b::/48);
@def $zobel6 = ($zobel6 2001:6f8:1215::/48); # baldur
@def $zobel6 = ($zobel6 2001:6f8:928::/48); # WS2
@def $zobel6 = ($zobel6 2a01:198:549::/48); # WGS20
+@def $zobel6 = ($zobel6 2a01:198:6b2::/48); # AdS20
@def $luca6 = ();
@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6);
-@def $USER_kibi = ();
-@def $USER_kibi = ($USER_kibi 90.80.97.98); # gruyere.kerlabs.com
-@def $USER_kibi = ($USER_kibi 88.164.242.219); # home.ikibiki.org
-@def $USER_kibi = ($USER_kibi 82.244.158.68); # @parents'
+@def $USER_christoph = ();
+@def $USER_christoph = ($USER_christoph 212.114.250.148/31);
@def $USER_aurel32 = ();
-@def $USER_aurel32 = ($USER_aurel32 88.191.82.174); # hall.aurel32.net
+@def $USER_aurel32 = ($USER_aurel32 88.191.126.93); # hall.aurel32.net
@def $USER_aurel32 = ($USER_aurel32 82.232.2.251); # farad.aurel32.net
-@def $FREEBSD_SSH_ACCESS = ($DSA_IPS $USER_kibi $USER_aurel32);
+@def $FREEBSD_SSH_ACCESS = ();
+@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $DSA_IPS $USER_christoph $USER_aurel32);
+@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS 194.177.211.200); # grieg