projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add luca's home and work IPv4 since they are fixed (effectively)
[mirror/dsa-puppet.git]
/
modules
/
ferm
/
templates
/
defs.conf.erb
diff --git
a/modules/ferm/templates/defs.conf.erb
b/modules/ferm/templates/defs.conf.erb
index
f539f51
..
8161d85
100644
(file)
--- a/
modules/ferm/templates/defs.conf.erb
+++ b/
modules/ferm/templates/defs.conf.erb
@@
-71,6
+71,7
@@
@def $HOST_EASYDNS_V4 = (64.68.200.91);
@def $HOST_RCODE0_V4 = (83.136.34.0/27);
@def $HOST_RCODE0_V6 = (2A02:850:8::/47);
@def $HOST_EASYDNS_V4 = (64.68.200.91);
@def $HOST_RCODE0_V4 = (83.136.34.0/27);
@def $HOST_RCODE0_V6 = (2A02:850:8::/47);
+@def $HOST_NETNOD_V4 = (192.71.80.0/24 192.36.144.222 192.36.144.218);
@def $HOST_DEBIAN_V4 = (<%= scope.function_filter_ipv4([dbs]).uniq.join(' ') %>);
@def $HOST_DEBIAN_V6 = (<%= scope.function_filter_ipv6([dbs]).uniq.join(' ') %>);
@def $HOST_DEBIAN_V4 = (<%= scope.function_filter_ipv4([dbs]).uniq.join(' ') %>);
@def $HOST_DEBIAN_V6 = (<%= scope.function_filter_ipv6([dbs]).uniq.join(' ') %>);
@@
-93,15
+94,18
@@
@def $zobel = ($zobel 93.94.128.0/21); # DG-i AS
@def $zobel = ($zobel 195.49.152.0/22); # DG-i AS
@def $zobel = ($zobel 194.187.64.0/22); # DG-i AS
@def $zobel = ($zobel 93.94.128.0/21); # DG-i AS
@def $zobel = ($zobel 195.49.152.0/22); # DG-i AS
@def $zobel = ($zobel 194.187.64.0/22); # DG-i AS
-@def $luca = (64.71.152.109);
+@def $luca = ();
+@def $luca = ($luca 69.4.89.5); # jump fubar.emyr.net
+@def $luca = ($luca 137.82.37.25); # jump eye.iun.ubc.ca
+@def $luca = ($luca 50.67.19.106); # home
+@def $luca = ($luca 142.103.249.101); # work
@def $paravoid = (62.217.125.135); # scrooge.tty.gr
@def $tfheen = ();
@def $paravoid = (62.217.125.135); # scrooge.tty.gr
@def $tfheen = ();
-@def $tfheen = ($tfheen 194.31.39.0/26); # office network
@def $tfheen = ($tfheen 195.159.200.122); # home
@def $tfheen = ($tfheen 77.40.254.120/29); # home
@def $jcristau = ();
@def $jcristau = ($jcristau 82.225.74.107/32); # home
@def $tfheen = ($tfheen 195.159.200.122); # home
@def $tfheen = ($tfheen 77.40.254.120/29); # home
@def $jcristau = ();
@def $jcristau = ($jcristau 82.225.74.107/32); # home
-@def $jcristau = ($jcristau 109.190.107.82/32); # office
+@def $jcristau = ($jcristau 109.190.1
88.123/32 109.190.188.138/32 109.190.1
07.82/32); # office
@def $master = (82.195.75.110); # master.debian.org
@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen $jcristau $master);
@def $master = (82.195.75.110); # master.debian.org
@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen $jcristau $master);
@@
-119,7
+123,6
@@
@def $luca6 = ();
@def $paravoid6 = (2001:648:2ffc:113:dcdb:eeff:fe5c:182b); # scrooge.tty.gr
@def $tfheen6 = ();
@def $luca6 = ();
@def $paravoid6 = (2001:648:2ffc:113:dcdb:eeff:fe5c:182b); # scrooge.tty.gr
@def $tfheen6 = ();
-@def $tfheen6 = ($tfheen6 2a02:c0:1013:1::/64); # Office
@def $tfheen6 = ($tfheen6 2001:840:f000:4007::/64); # Home, link
@def $tfheen6 = ($tfheen6 2001:840:4007::/48); # Home
@def $jcristau6 = (2a01:e35:2e14:a6b0::/64); # home
@def $tfheen6 = ($tfheen6 2001:840:f000:4007::/64); # Home, link
@def $tfheen6 = ($tfheen6 2001:840:4007::/48); # Home
@def $jcristau6 = (2a01:e35:2e14:a6b0::/64); # home
@@
-129,9
+132,6
@@
@def $USER_christoph = ();
#@def $USER_christoph = ($USER_christoph 212.114.250.148/31);
#@def $USER_christoph = ($USER_christoph 128.111.48.6/32); # U of Cal at Santa Barbara, until 2013-03
@def $USER_christoph = ();
#@def $USER_christoph = ($USER_christoph 212.114.250.148/31);
#@def $USER_christoph = ($USER_christoph 128.111.48.6/32); # U of Cal at Santa Barbara, until 2013-03
-@def $USER_aurel32 = ();
-@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 $USER_joerg = ();
@def $USER_joerg = ($USER_joerg 213.146.108.160/29);
@def $USER_joerg = ($USER_joerg 46.4.205.32);
@def $USER_joerg = ();
@def $USER_joerg = ($USER_joerg 213.146.108.160/29);
@def $USER_joerg = ($USER_joerg 46.4.205.32);
@@
-142,8
+142,7
@@
@def $BUILDD_SSH_ACCESS = ();
@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 5.153.231.18); # wuiet
@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 97.107.116.29); # master
@def $BUILDD_SSH_ACCESS = ();
@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 5.153.231.18); # wuiet
@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 97.107.116.29); # master
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 206.12.19.5); # ravel
@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 82.195.75.110); # new-master
@def $FREEBSD_SSH_ACCESS = ();
@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $DSA_IPS $BUILDD_SSH_ACCESS);
@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 82.195.75.110); # new-master
@def $FREEBSD_SSH_ACCESS = ();
@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $DSA_IPS $BUILDD_SSH_ACCESS);
-@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $USER_christoph
$USER_aurel32
); # buildd admins
+@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $USER_christoph); # buildd admins