wireguard: Cleanup, adding android-trygvis.

8 files changed, 3 insertions, 136 deletions

diff --git a/ansible/group_vars/all/wireguard_wg0.yml b/ansible/group_vars/all/wireguard_wg0.yml
index 6e161a9..2a8f7e2 100644
--- a/ansible/group_vars/all/wireguard_wg0.yml
+++ b/ansible/group_vars/all/wireguard_wg0.yml
@@ -34,3 +34,6 @@ wireguard_wg0:
     sweetzpot-macos:
       state: present
       ipv6: fdf3:aad9:a885:0b3a::11
+    android-trygvis:
+      state: present
+      ipv6: fdf3:aad9:a885:0b3a::12
diff --git a/ansible/group_vars/all/wireguard_wg1.yml b/ansible/group_vars/all/wireguard_wg1.yml
deleted file mode 100644
index c8324d5..0000000
--- a/ansible/group_vars/all/wireguard_wg1.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-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:0272:b00b::1
-    android-trygvis:
-      state: present
-      ipv4: 192.168.110.2
-      ipv6: 2a01:7e00:e000:0272:b00b::2
diff --git a/ansible/group_vars/all/wireguard_wg_edipost.yml b/ansible/group_vars/all/wireguard_wg_edipost.yml
deleted file mode 100644
index 3511ab5..0000000
--- a/ansible/group_vars/all/wireguard_wg_edipost.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-wireguard_wg_edipost:
-  if: wg-edipost
-  ipv4_prefix: 24
-  shared_routes:
-    - gateway: 192.168.200.136
-      net: 192.168.100.0
-      prefix: 24
-
-  hosts:
-    conflatorio:
-      state: present
-      ipv4: 192.168.200.138
-    arius:
-      ipv4: 192.168.200.150
-    edipost-wg:
-      public_key: VWEMk20CI5RJohjnar4HicuaZbj3d1aoewvQNorWITs=
-      endpoint: 77.106.183.85
-      listen_port: 51820
-      peers: all
diff --git a/ansible/group_vars/all/wireguard_wg_hesland.yml b/ansible/group_vars/all/wireguard_wg_hesland.yml
deleted file mode 100644
index f9de778..0000000
--- a/ansible/group_vars/all/wireguard_wg_hesland.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-wireguard_wg_hesland:
-  if: wg-hesland
-  ipv4_prefix: 24
-  hosts:
-    webgateway:
-      endpoint: hesland.trygvis.io
-      listen_port: 55139
-    conflatorio:
-      ipv4: 10.0.212.2
-    arius:
-      ipv4: 10.0.212.4
diff --git a/ansible/group_vars/all/wireguard_wg_net1.yml b/ansible/group_vars/all/wireguard_wg_net1.yml
deleted file mode 100644
index bc2c39e..0000000
--- a/ansible/group_vars/all/wireguard_wg_net1.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-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/inventory b/ansible/inventory
index 1566f35..2e6d0cd 100644
--- a/ansible/inventory
+++ b/ansible/inventory
@@ -139,14 +139,6 @@ all:
       children:
         borg_nas:
 
-    wireguard_wg_net1:
-      hosts:
-        akili:
-        arius:
-        birgitte:
-        conflatorio:
-        knot:
-
     wireguard_wg0:
       hosts:
         akili:
@@ -159,20 +151,6 @@ all:
         malabaricus:
         sweetzpot-mobile:
         sweetzpot-macos:
-
-    wireguard_wg1:
-      hosts:
         android-trygvis:
-        knot:
-
-    wireguard_hesland:
-      hosts:
-        arius:
-        conflatorio:
-
-    wireguard_edipost:
-      hosts:
-        arius:
-        conflatorio:
 
 # vim: set filetype=yaml:
diff --git a/ansible/plays/files/android-trygvis/etc/wireguard/public-wg1.key b/ansible/plays/files/android-trygvis/etc/wireguard/public-wg0.key
index 4ab6833..4ab6833 100644
--- a/ansible/plays/files/android-trygvis/etc/wireguard/public-wg1.key
+++ b/ansible/plays/files/android-trygvis/etc/wireguard/public-wg0.key
diff --git a/ansible/plays/wireguard.yml b/ansible/plays/wireguard.yml
deleted file mode 100644
index 87ae59b..0000000
--- a/ansible/plays/wireguard.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-- hosts:
-    - wireguard_wg_net1
-  tags:
-    - never
-    - wg-net1
-  roles:
-    - role: wireguard
-      wireguard__state: absent
-      wireguard__name: wireguard_wg_net1
-
-- import_playbook: wireguard-wg0.yml
-  tags: wg0
-
-- hosts:
-    - wireguard_wg1
-  tags: wg1
-  roles:
-    - role: wireguard
-      wireguard__name: wireguard-wg1
-
-- hosts:
-    - wireguard_hesland
-  tags: wg_hesland
-  roles:
-    - role: wireguard
-      wireguard__name: wireguard_wg_hesland
-      wireguard__state: absent
-
-- hosts:
-    - wireguard_edipost
-  tags: wg_edipost
-  roles:
-    - role: wireguard
-      wireguard__name: wireguard_wg_edipost
-      wireguard__state: absent
-  vars:
-    wg_net: "{{ hostvars[ansible_hostname][wireguard__name] }}"