Fix CSAIL IPv6 subnet

diff --git a/modules/debian_org/files/misc/hoster.yaml b/modules/debian_org/files/misc/hoster.yaml
index ce8cb18..36dda19 100644 (file)
--- a/modules/debian_org/files/misc/hoster.yaml
+++ b/modules/debian_org/files/misc/hoster.yaml
@@ -51,7 +51,7 @@ conova:
 csail:
   netrange:
     - 128.31.0.0/24
-    - 2001:470:8b2d:bb8::/64
+    - 2603:400a:ffff:bb8::/64
   mirror-debian: https://mirrors.wikimedia.org/debian
 dgi:
   netrange:

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 1ded234..9c89e07 100644 (file)
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -81,9 +81,9 @@
 #                                             syncproxy.au           syncproxy2.eu              syncproxy3.eu           syncproxy4.eu
 @def $HOST_SYNCPROXY_V4 = ($HOST_SYNCPROXY_V4 150.203.164.60         130.89.148.10              5.153.231.9             217.196.149.237);
 @def $HOST_SYNCPROXY_V6 = ($HOST_SYNCPROXY_V6 2001:388:1034:2900::3c 2001:67c:2564:a119::148:10 2001:41c8:1000:21::21:9 2a02:16a8:dc41:100::237);
-#                                             syncproxy.cna                syncproxy.na               syncproxy2.wna   syncproxy3.wna
-@def $HOST_SYNCPROXY_V4 = ($HOST_SYNCPROXY_V4 128.101.240.216              128.31.0.64                149.20.4.16      209.87.16.40);
-@def $HOST_SYNCPROXY_V6 = ($HOST_SYNCPROXY_V6 2607:ea00:101:3c0b::1deb:216 2001:470:8b2d:bb8::801f:40                  2001:4f8:1:c::16 2607:f8f0:614:1::1274:40);
+#                                             syncproxy.cna                syncproxy.na                syncproxy2.wna   syncproxy3.wna
+@def $HOST_SYNCPROXY_V4 = ($HOST_SYNCPROXY_V4 128.101.240.216              128.31.0.64                 149.20.4.16      209.87.16.40);
+@def $HOST_SYNCPROXY_V6 = ($HOST_SYNCPROXY_V6 2607:ea00:101:3c0b::1deb:216 2603:400a:ffff:bb8::801f:40                  2001:4f8:1:c::16 2607:f8f0:614:1::1274:40);
 
 @def $HOST_DNS_GEO_V4 = (<%= scope.function_filter_ipv4([rolehost['dns_geo']]).uniq.join(' ') %>);
 @def $HOST_DNS_GEO_V6 = (<%= scope.function_filter_ipv6([rolehost['dns_geo']]).uniq.join(' ') %>);