X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fdoc%2Ffirewall.mdwn;h=1037e819f451a9663e09f6179a3e2f2ae9bb54bd;hb=0050b31110305f8948bf373f3858a5af182d2a3b;hp=67ea832c3970403350b808392526d9117ab31e2c;hpb=f673a4bc909d77527788944052da7e2095500329;p=mirror%2Fdsa-wiki.git

diff --git a/input/doc/firewall.mdwn b/input/doc/firewall.mdwn
index 67ea832..1037e81 100644
--- a/input/doc/firewall.mdwn
+++ b/input/doc/firewall.mdwn
@@ -17,20 +17,22 @@ Science department hosts our machine but central IT which controls the
 University's border routers think ICMP is the devil's doing).
 
 In these cases we usually ask for the following setup:
- * allow all outgoing traffic
- * allow incoming ICMP
- * allow incoming tcp/22 (ssh)
- * allow all incoming from
- ** bytemark: 5.153.231.0/24
- ** grnet: 194.177.211.192/27
- ** man-da: 82.195.75.64/26
- ** sil: 86.59.118.144/28
- ** ubcece: 206.12.19.5.0/24
- ** bytemark: 
- ** grnet: 2001:648:2ffc:deb::/64
- ** man-da: 2001:41b8:202:deb::/64
- ** sil: 2001:858:2:2::/64
- ** ubcece: 2607:f8f0:610:4000::/64
+
+* allow all outgoing traffic
+* allow incoming ICMP
+* allow incoming tcp/22 (ssh)
+* allow all incoming from
+  * bytemark: 5.153.231.0/24
+  * grnet: 194.177.211.192/27
+  * man-da: 82.195.75.64/26
+  * sil: 86.59.118.144/28
+  * ubcece: 206.12.19.5.0/24
+  * bytemark: 2001:41c8:1000::/48
+  * grnet: 2001:648:2ffc:deb::/64
+  * man-da: 2001:41b8:202:deb::/64
+  * sil: 2001:858:2:2::/64
+  * ubcece: 2607:f8f0:610:4000::/64
+* allow all return traffic on tcp/udp/etc.
 
 Extra ports might be required for specific services.