wireguard: Rewrite.

4 files changed, 75 insertions, 37 deletions

diff --git a/ansible/group_vars/all/wireguard_wg-net1.yml b/ansible/group_vars/all/wireguard_wg-net1.yml
new file mode 100644
index 0000000..33044ab
--- /dev/null
+++ b/ansible/group_vars/all/wireguard_wg-net1.yml
@@ -0,0 +1,32 @@
+wireguard-wg-net1:
+  if: wg-net1
+  ipv4_prefix: 24
+  ipv6_prefix: 64
+  hosts:
+    knot:
+      endpoint: trygvis.io
+      listen_port: 51820
+      ipv4: 192.168.80.1
+      # Generated by https://www.ultratools.com/tools/rangeGenerator
+      ipv6: fdf3:aad9:a885:0b3a::1
+      peers: all
+    birgitte:
+      state: present
+      ipv4: 192.168.80.2
+      ipv6: fdf3:aad9:a885:0b3a::2
+    conflatorio:
+      state: present
+      ipv4: 192.168.80.3
+      ipv6: fdf3:aad9:a885:0b3a::3
+    fuckaduck:
+      state: absent
+      ipv4: 192.168.80.4
+      ipv6: fdf3:aad9:a885:0b3a::4
+    arius:
+      state: present
+      ipv4: 192.168.80.6
+      ipv6: fdf3:aad9:a885:0b3a::6
+    akili:
+      state: present
+      ipv4: 192.168.80.7
+      ipv6: fdf3:aad9:a885:0b3a::7
diff --git a/ansible/group_vars/all/wireguard_wg0.yml b/ansible/group_vars/all/wireguard_wg0.yml
new file mode 100644
index 0000000..4e8238b
--- /dev/null
+++ b/ansible/group_vars/all/wireguard_wg0.yml
@@ -0,0 +1,28 @@
+wireguard-wg0:
+  if: wg0
+  ipv4_prefix: 24
+  ipv6_prefix: 64
+  hosts:
+    knot:
+      endpoint: trygvis.io
+      listen_port: 51821
+      peers: all
+      ipv4: 192.168.60.1
+      # Generated by https://www.ultratools.com/tools/rangeGenerator
+      ipv6: fdf3:aad9:a885:0b3b::1
+#    birgitte:
+#      state: present
+#      ipv4: 192.168.60.2
+#      ipv6: fdf3:aad9:a885:0b3b::2
+    conflatorio:
+      state: present
+      ipv4: 192.168.60.3
+      ipv6: fdf3:aad9:a885:0b3b::3
+#    arius:
+#      state: present
+#      ipv4: 192.168.60.6
+#      ipv6: fdf3:aad9:a885:0b3b::6
+#    akili:
+#      state: present
+#      ipv4: 192.168.60.7
+#      ipv6: fdf3:aad9:a885:0b3b::7
diff --git a/ansible/group_vars/all/wireguard_wg1.yml b/ansible/group_vars/all/wireguard_wg1.yml
new file mode 100644
index 0000000..a053dca
--- /dev/null
+++ b/ansible/group_vars/all/wireguard_wg1.yml
@@ -0,0 +1,15 @@
+wireguard-wg1:
+  if: wg1
+  ipv4_prefix: 24
+  ipv6_prefix: 64
+  hosts:
+    knot:
+      endpoint: trygvis.io
+      listen_port: 51822
+      peers: all
+      ipv4: 192.168.110.1
+      ipv6: 2a01:7e00:e000:272::b00b::1
+    android-trygvis:
+      state: present
+      ipv4: 192.168.110.2
+      ipv6: 2a01:7e00:e000:272::b00b::2
diff --git a/ansible/group_vars/wireguard_net1.yml b/ansible/group_vars/wireguard_net1.yml
deleted file mode 100644
index deb330a..0000000
--- a/ansible/group_vars/wireguard_net1.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-wireguard__net_id: net1
-wireguard__listen_port: 51820
-wireguard__server:
-  ansible_hostname: knot
-  hostname: trygvis.io
-  ipv4:
-    address: 192.168.80.1
-    prefix: 24
-  # Generated by https://www.ultratools.com/tools/rangeGenerator
-  ipv6:
-    address: fdf3:aad9:a885:0b3a::1
-    prefix: 64
-wireguard__clients:
-  birgitte:
-    state: present
-    ipv4: 192.168.80.2
-    ipv6: fdf3:aad9:a885:0b3a::2
-  conflatorio:
-    state: present
-    ipv4: 192.168.80.3
-    ipv6: fdf3:aad9:a885:0b3a::3
-  fuckaduck:
-    state: present
-    ipv4: 192.168.80.4
-    ipv6: fdf3:aad9:a885:0b3a::4
-  android-trygvis:
-    state: present
-    ipv4: 192.168.80.5
-    ipv6: fdf3:aad9:a885:0b3a::5
-  arius:
-    state: present
-    ipv4: 192.168.80.6
-    ipv6: fdf3:aad9:a885:0b3a::6
-  akili:
-    state: present
-    ipv4: 192.168.80.7
-    ipv6: fdf3:aad9:a885:0b3a::7