X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/ssh-ca/blobdiff_plain/3a890d943e646cfeb7cec844d0beb35275de4e3f..34ee16f5432a81edf3b25bb2f6619985b888461b:/etc/hosts

diff --git a/etc/hosts b/etc/hosts
index 1dbd71a..b152165 100644
--- a/etc/hosts
+++ b/etc/hosts
@@ -2,33 +2,50 @@
 
 ## Servers.
 ibanez \
-	62.49.204.153 2001:470:1f09:1b98::9 \
-	172.29.199.14 2001:470:9740:1::14
-##radius \
-##	62.49.204.146 2001:470:1f09:1b98::2 \
-##	172.29.199.1 2001:470:9740:1::1 \
-##	172.29.199.193 2001:470:9740:4001::1 \
-##	172.29.198.1 2001:470:9740:8001::1
-##roadstar \
-##	62.49.204.147 2001:470:1f09:1b98::3 \
-##	172.29.199.2 2001:470:9740:1::2
-##jem \
-##	62.49.204.148 2001:470:1f09:1b98::4 \
-##	172.29.199.3 2001:470:9740:1::3
-##artist \
-##	 62.49.204.149 2001:470:1f09:1b98::5 \
-##	 172.29.199.4 2001:470:9740:1::4
+	.dmz 62.49.204.153 2001:470:1f09:1b98::9 \
+	.unsafe 172.29.199.14 2001:470:9740:1::14
+radius \
+	.dmz 62.49.204.146 2001:470:1f09:1b98::2 \
+	.unsafe 172.29.199.1 2001:470:9740:1::1 \
+	.safe 172.29.199.193 2001:470:9740:4001::1 \
+	.untrusted 172.29.198.1 2001:470:9740:8001::1
+roadstar \
+	.dmz 62.49.204.147 2001:470:1f09:1b98::3 \
+	.unsafe 172.29.199.2 2001:470:9740:1::2
+jem \
+	.dmz 62.49.204.148 2001:470:1f09:1b98::4 \
+	.unsafe 172.29.199.3 2001:470:9740:1::3
+artist \
+	.dmz 62.49.204.149 2001:470:1f09:1b98::5 \
+	.unsafe 172.29.199.4 2001:470:9740:1::4 \
+	.untrusted 172.29.198.2 2001:470:9740:8001::2
+orange \
+	172.29.199.131 2001:ba8:1d9:6000::3:0
 fender \
-	212.13.198.69 2001:ba8:0:1d9::2 \
-	172.29.199.177 2001:ba8:1d9:2::1
-vampire git git-master ftp \
-	62.49.204.150 2001:470:1f09:1b98::6 \
-	172.29.199.5 2001:470:9740:1::14 \
-	172.29.199.194 2001:470:9740:4001::2 \
-	172.29.198.3 2001:470:9740:8001::3 \
-	radius 62.49.204.146 172.29.199.1 172.29.198.1 \
-	roadstar 172.29.199.2 \
-	2001:470:1f08:1b98::2
+	.jump 212.13.198.69 2001:ba8:0:1d9::2 \
+	.colo 172.29.199.177 2001:ba8:1d9:2::1
+precision \
+	.jump 212.13.198.70 2001:ba8:0:1d9::3 \
+	.colo 172.29.199.178 2001:ba8:1d9:2::2
+telecaster tele \
+	.jump 212.13.198.71 2001:ba8:0:1d9::4 \
+	.colo 172.29.199.179 2001:ba8:1d9:2::3 \
+	ftp dyndns
+stratocaster strat \
+	.jump 212.13.198.72 2001:ba8:0:1d9::5 \
+	.colo 172.29.199.180 2001:ba8:1d9:2::4 \
+	git www
+jazz \
+	.jump 212.13.198.73 2001:ba8:0:1d9::6 \
+	.colo 172.29.199.181 2001:ba8:1d9:2::5 \
+	.iodine 172.29.198.129
+jaguar \
+	.jump 212.13.198.75 2001:ba8:0:1d9::8
+vampire \
+	.dmz 62.49.204.150 2001:470:1f09:1b98::6 \
+	.unsafe 172.29.199.5 2001:470:9740:1::5 \
+	.safe 172.29.199.194 2001:470:9740:4001::2 \
+	.untrusted 172.29.198.3 2001:470:9740:8001::3
 
 ## Workstation and occasional guests.
 gibson
@@ -36,4 +53,12 @@ marauder
 invader
 
 ## Mobile devices.
-crybaby 172.29.199.129 2001:ba8:1d9:6000::1
+crybaby \
+	172.29.199.129 2001:ba8:1d9:6000::1:0
+terror \
+	172.29.199.130
+
+## Satellite networks.
+@domain binswood.org.uk
+mango \
+	10.165.27.3