WIP

freifunk-mwu · Feb 16, 2022 · c8f2a8d · c8f2a8d
1 parent 75b1b16
commit c8f2a8d
Show file tree

Hide file tree

Showing 72 changed files with 940 additions and 812 deletions.
diff --git a/inventory/group_vars/all b/inventory/group_vars/all
@@ -470,8 +470,10 @@ meshes:
     ipv6_public:
       - 2a03:2260:11a:ff::/64
     batman:
-      it: 10000
-      gw: server 96mbit/96mbit
+      it: 10s
+      gw: server
+      up: 96M
+      down: 96M
       mm: 0
       dat: 1
       hop_penalty: 60
@@ -507,8 +509,10 @@ meshes:
     ipv6_public:
       - 2a03:2260:11a:1::/64
     batman:
-      it: 10000
-      gw: server 96mbit/96mbit
+      it: 10s
+      gw: server
+      up: 96M
+      down: 96M
       mm: 0
       dat: 1
       hop_penalty: 60
@@ -544,8 +548,10 @@ meshes:
     ipv6_public:
       - 2a03:2260:11a:2::/64
     batman:
-      it: 10000
-      gw: server 96mbit/96mbit
+      it: 10s
+      gw: server
+      up: 96M
+      down: 96M
       mm: 0
       dat: 1
       hop_penalty: 60
@@ -581,8 +587,10 @@ meshes:
     ipv6_public:
       - 2a03:2260:11a:3::/64
     batman:
-      it: 10000
-      gw: server 96mbit/96mbit
+      it: 10s
+      gw: server
+      up: 96M
+      down: 96M
       mm: 0
       dat: 1
       hop_penalty: 60
@@ -618,8 +626,10 @@ meshes:
     ipv6_public:
       - 2a03:2260:11a:4::/64
     batman:
-      it: 10000
-      gw: server 96mbit/96mbit
+      it: 10s
+      gw: server
+      up: 96M
+      down: 96M
       mm: 0
       dat: 1
       hop_penalty: 60
@@ -655,8 +665,10 @@ meshes:
     ipv6_public:
       - 2a03:2260:11a:5::/64
     batman:
-      it: 10000
-      gw: server 96mbit/96mbit
+      it: 10s
+      gw: server
+      up: 96M
+      down: 96M
       mm: 0
       dat: 1
       hop_penalty: 60
@@ -692,8 +704,10 @@ meshes:
     ipv6_public:
       - 2a03:2260:11a:6::/64
     batman:
-      it: 10000
-      gw: server 96mbit/96mbit
+      it: 10s
+      gw: server
+      up: 96M
+      down: 96M
       mm: 0
       dat: 1
       hop_penalty: 60
@@ -729,8 +743,10 @@ meshes:
     ipv6_public:
       - 2a03:2260:11a:7::/64
     batman:
-      it: 10000
-      gw: server 96mbit/96mbit
+      it: 10s
+      gw: server
+      up: 96M
+      down: 96M
       mm: 0
       dat: 1
       hop_penalty: 60
@@ -771,8 +787,10 @@ meshes:
       - ffmz.org
       - user.ffmz.org
     batman:
-      it: 10000
-      gw: server 96mbit/96mbit
+      it: 10s
+      gw: server
+      up: 96M
+      down: 96M
       mm: 0
       dat: 1
       hop_penalty: 60
@@ -817,8 +835,10 @@ meshes:
       - ffwi.org
       - user.ffwi.org
     batman:
-      it: 10000
-      gw: server 96mbit/96mbit
+      it: 10s
+      gw: server
+      up: 96M
+      down: 96M
       mm: 0
       dat: 1
       hop_penalty: 60

diff --git a/inventory/group_vars/gateways b/inventory/group_vars/gateways
@@ -2,6 +2,7 @@
 routing_tables:
   icvpn: 23
   mwu: 41
+  unreachable: 51
   internet: 61
 
 common_repos:

diff --git a/playbooks/gateways.yml b/playbooks/gateways.yml
@@ -16,13 +16,10 @@
   - service-ntpd
   - kmod-batman
   - wireguard
-  - network-routetables
-  - network-batman
-  - network-meshbridge
-  - network-fastd
+  - network-routing
+  - network-mesh
   - network-ffrl
   - network-iptables-gateway
-  - network-routing
   - service-nginx
   - service-nginx-firmware
   - service-prometheus

diff --git a/playbooks/monitoring.yml b/playbooks/monitoring.yml
@@ -15,11 +15,8 @@
   - service-ntpd
   - kmod-batman
   - wireguard
-  - network-routetables
-  - network-batman
-  - network-meshbridge
-  - network-fastd
   - network-routing
+  - network-mesh
   - service-nginx
   - service-nginx-openlayers
   - service-cpthook

diff --git a/playbooks/services.yml b/playbooks/services.yml
@@ -14,7 +14,6 @@
   - service-haveged
   - service-ntpd
   - wireguard
-  - network-routetables
   - network-routing
   - service-bird
   - service-nginx

diff --git a/roles/network-anycast/handlers/main.yml b/roles/network-anycast/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
-- name: reload network interfaces
+- name: restart networkd
   systemd:
-    name: networking
-    state: reloaded
+    name: systemd-networkd
+    state: restarted
diff --git a/roles/network-anycast/tasks/main.yml b/roles/network-anycast/tasks/main.yml
@@ -1,6 +1,12 @@
 ---
-- name: create anycast interface
+- name: create anycast.netdev
   template:
-    src: anycast.j2
-    dest: "/etc/network/interfaces.d/anycast"
-  notify: reload network interfaces
+    src: anycast.netdev.j2
+    dest: "/etc/systemd/network/anycast.netdev"
+  notify: restart networkd
+
+- name: create anycast.network
+  template:
+    src: anycast.network.j2
+    dest: "/etc/systemd/network/anycast.netdev"
+  notify: restart networkd
diff --git a/roles/network-anycast/templates/anycast.j2 b/roles/network-anycast/templates/anycast.j2
diff --git a/roles/network-anycast/templates/anycast.netdev.j2 b/roles/network-anycast/templates/anycast.netdev.j2
@@ -0,0 +1,6 @@
+#
+# {{ ansible_managed }}
+#
+[NetDev]
+Name=anycast
+Kind=dummy
diff --git a/roles/network-anycast/templates/anycast.network.j2 b/roles/network-anycast/templates/anycast.network.j2
@@ -0,0 +1,9 @@
+#
+# {{ ansible_managed }}
+#
+[Match]
+Name=anycast
+
+[Network]
+Address={{ anycast_ipv4 | ipaddr('network/prefix') }}
+Address={{ anycast_ipv6 | ipaddr('network/prefix') }}
diff --git a/roles/network-batman/handlers/main.yml b/roles/network-batman/handlers/main.yml
diff --git a/roles/network-batman/tasks/main.yml b/roles/network-batman/tasks/main.yml
diff --git a/roles/network-batman/templates/batman.j2 b/roles/network-batman/templates/batman.j2
diff --git a/roles/network-fastd/README.md b/roles/network-fastd/README.md
diff --git a/roles/network-fastd/handlers/main.yml b/roles/network-fastd/handlers/main.yml
diff --git a/roles/network-fastd/tasks/main.yml b/roles/network-fastd/tasks/main.yml
diff --git a/roles/network-ffrl/handlers/main.yml b/roles/network-ffrl/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
-- name: reload network interfaces
+- name: restart networkd
   systemd:
-    name: networking
-    state: reloaded
+    name: systemd-networkd
+    state: restarted
diff --git a/roles/network-ffrl/tasks/main.yml b/roles/network-ffrl/tasks/main.yml
@@ -1,16 +1,35 @@
 ---
-- name: create ffrl interfaces
+- name: create ffrl-nat.netdev
   template:
-    src: ffrl.j2
-    dest: "/etc/network/interfaces.d/{{ item.key }}"
-  notify: reload network interfaces
+    src: ffrl-gre.netdev.j2
+    dest: "/etc/systemd/network/{{ item.key }}.netdev"
+  notify: restart networkd
   loop: "{{ ffrl_exit_server | dict2items }}"
 
-- name: create ffrl-nat dummy interface
+- name: create ffrl-nat.network
   template:
-    src: ffrl_nat.j2
-    dest: "/etc/network/interfaces.d/ffrl-nat"
-  notify: reload network interfaces
+    src: ffrl-gre.network.j2
+    dest: "/etc/systemd/network/{{ item.key }}.network"
+  notify: restart networkd
+  loop: "{{ ffrl_exit_server | dict2items }}"
+
+- name: create ffrl-nat.netdev
+  template:
+    src: ffrl-nat.netdev.j2
+    dest: "/etc/systemd/network/ffrl-nat.netdev"
+  notify: restart networkd
+
+- name: create ffrl-nat.network
+  template:
+    src: ffrl-nat.network.j2
+    dest: "/etc/systemd/network/ffrl-nat.network"
+  notify: restart networkd
+
+- name: create ffrl-tunnel.conf
+  template:
+    src: ffrl-tunnel.conf.j2
+    dest: "/etc/systemd/network/{{ ansible_default_ipv4.interface }}.network.d/ffrl-tunnel.conf"
+  notify: restart networkd
 
 - name: flush handlers
   meta: flush_handlers