aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsbjørn Sloth Tønnesen <asbjorn@labitat.dk>2018-11-26 23:26:17 +0000
committerEmil Renner Berthing <esmil@labitat.dk>2018-11-28 21:16:46 +0100
commit786884832acd667376cc92d5d7d858dcf545371e (patch)
treeb4102388afec79a415c59649f21e98704ccdf785
parented9133359abca62f2be8414dca767401565ddb15 (diff)
downloadlabitat-ansible-786884832acd667376cc92d5d7d858dcf545371e.tar.gz
labitat-ansible-786884832acd667376cc92d5d7d858dcf545371e.tar.xz
labitat-ansible-786884832acd667376cc92d5d7d858dcf545371e.zip
space_server: add Asbjorn's colo addresses and net
-rw-r--r--documentation/addressplan.txt3
-rw-r--r--roles/space_server/files/networkd/10-lan20.network13
-rw-r--r--roles/space_server/files/nftables.conf5
3 files changed, 20 insertions, 1 deletions
diff --git a/documentation/addressplan.txt b/documentation/addressplan.txt
index 7e8aa6e..a32dbf5 100644
--- a/documentation/addressplan.txt
+++ b/documentation/addressplan.txt
@@ -7,6 +7,7 @@
* 185.38.175.069 - spacebrain.labitat.dk
* 185.38.175.070 - spacewand.labitat.dk
* 185.38.175.071 - reserved for tor exit node
+ * 185.38.175.075 - Asbjorn
********************* 2a01:4262:1ab:0000::/48 - allocated and announced
******************** 2a01:4262:1ab:0xxx::/52 - labitat internal use
@@ -23,10 +24,12 @@
***************** 2a01:4262:1ab:0020::/64 - vlan 20 - labicolo
* 2a01:4262:1ab:0020::5 - spacewand.labitat.dk
* 2a01:4262:1ab:0020::6 - spacebrain.labitat.dk
+ * 2a01:4262:1ab:0020::75 - Asbjorn
******************** 2a01:4262:1ab:1xxx::/52 - labicolo 16x /56
******************* 2a01:4262:1ab:10xx::/56 - 256x /64 delegations
******************* 2a01:4262:1ab:11xx::/56 - 16x /60 delegations
+ ****************** 2a01:4262:1ab:110x::/60 - Asbjorn
Linknets:
diff --git a/roles/space_server/files/networkd/10-lan20.network b/roles/space_server/files/networkd/10-lan20.network
index 06b1ff1..c515443 100644
--- a/roles/space_server/files/networkd/10-lan20.network
+++ b/roles/space_server/files/networkd/10-lan20.network
@@ -14,6 +14,10 @@ MulticastDNS=no
LLDP=yes
EmitLLDP=no
+##
+## Vanity addresses
+##
+
[Route]
Destination=2a01:4262:1ab::cafe/128
Gateway=2a01:4262:1ab:20::5
@@ -21,3 +25,12 @@ Gateway=2a01:4262:1ab:20::5
[Route]
Destination=2a01:4262:1ab::db/128
Gateway=2a01:4262:1ab:20::6
+
+##
+## Labicolo
+##
+
+# Asbjorn /60
+[Route]
+Destination=2a01:4260:1ab:1100::/60
+Gateway=2a01:4262:1ab:20::75
diff --git a/roles/space_server/files/nftables.conf b/roles/space_server/files/nftables.conf
index 3c34582..4bd4f5b 100644
--- a/roles/space_server/files/nftables.conf
+++ b/roles/space_server/files/nftables.conf
@@ -44,7 +44,10 @@ define pass_net6 = 2a01:4262:1ab:e::/64
define colo_if = lan20
define colo_ip4 = 185.38.175.65
define colo_net4 = 185.38.175.64/26
-define colo_net6 = 2a01:4262:1ab:20::/64
+define colo_net6 = {
+ 2a01:4262:1ab:20::/64,
+ 2a01:4262:1ab:1100::/60, # Asbjorn
+}
define avahi_ifs = { $wire_if, $priv_if, $pass_if }