From 8799c94364f813062295b02857b39049593990d8 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Thu, 6 Jun 2024 19:19:16 +0200
Subject: tnet

---
 tnet/host_vars/akili/tnet.yml  |  7 -------
 tnet/host_vars/akili/wg.yml    |  7 +++++++
 tnet/host_vars/hash/tnet.yml   |  8 --------
 tnet/host_vars/hash/wg.yml     |  8 ++++++++
 tnet/host_vars/knot/tnet.yml   | 14 --------------
 tnet/host_vars/knot/wg.yml     | 14 ++++++++++++++
 tnet/host_vars/kv24ix/tnet.yml |  2 --
 tnet/host_vars/kv24ix/wg.yml   |  2 ++
 tnet/host_vars/lhn2ix/tnet.yml |  2 --
 tnet/host_vars/lhn2ix/wg.yml   |  2 ++
 tnet/wg-keys.yml               |  2 +-
 tnet/wg-links.yml              |  2 +-
 12 files changed, 35 insertions(+), 35 deletions(-)
 delete mode 100644 tnet/host_vars/akili/tnet.yml
 create mode 100644 tnet/host_vars/akili/wg.yml
 delete mode 100644 tnet/host_vars/hash/tnet.yml
 create mode 100644 tnet/host_vars/hash/wg.yml
 delete mode 100644 tnet/host_vars/knot/tnet.yml
 create mode 100644 tnet/host_vars/knot/wg.yml
 delete mode 100644 tnet/host_vars/kv24ix/tnet.yml
 create mode 100644 tnet/host_vars/kv24ix/wg.yml
 delete mode 100644 tnet/host_vars/lhn2ix/tnet.yml
 create mode 100644 tnet/host_vars/lhn2ix/wg.yml

diff --git a/tnet/host_vars/akili/tnet.yml b/tnet/host_vars/akili/tnet.yml
deleted file mode 100644
index b12cc96..0000000
--- a/tnet/host_vars/akili/tnet.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-tnet_links:
-  hash:
-    endpoint: hash.trygvis.io:51002
-    address: fdb1:4242:3538:ffff:ca85:f812:3935:5fbb
-  knot:
-    endpoint: knot.inamo.no:51004
-    address: fdb1:4242:3538:ffff:59d7:cf77:8b5d:761a
diff --git a/tnet/host_vars/akili/wg.yml b/tnet/host_vars/akili/wg.yml
new file mode 100644
index 0000000..b666d8f
--- /dev/null
+++ b/tnet/host_vars/akili/wg.yml
@@ -0,0 +1,7 @@
+tnet_wg:
+  hash:
+    endpoint: hash.trygvis.io:51002
+    address: fdb1:4242:3538:ffff:ca85:f812:3935:5fbb
+  knot:
+    endpoint: knot.inamo.no:51004
+    address: fdb1:4242:3538:ffff:59d7:cf77:8b5d:761a
diff --git a/tnet/host_vars/hash/tnet.yml b/tnet/host_vars/hash/tnet.yml
deleted file mode 100644
index 8246dfd..0000000
--- a/tnet/host_vars/hash/tnet.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-tnet_links:
-  knot:
-    port: 51001
-    endpoint: knot.trygvis.io:51001
-    address: fdb1:4242:3538:ffff:410b:dabe:1a0d:6843
-  akili:
-    port: 51002
-    address: fdb1:4242:3538:ffff:ca85:f812:3935:5fba
diff --git a/tnet/host_vars/hash/wg.yml b/tnet/host_vars/hash/wg.yml
new file mode 100644
index 0000000..a82855c
--- /dev/null
+++ b/tnet/host_vars/hash/wg.yml
@@ -0,0 +1,8 @@
+tnet_wg:
+  knot:
+    port: 51001
+    endpoint: knot.trygvis.io:51001
+    address: fdb1:4242:3538:ffff:410b:dabe:1a0d:6843
+  akili:
+    port: 51002
+    address: fdb1:4242:3538:ffff:ca85:f812:3935:5fba
diff --git a/tnet/host_vars/knot/tnet.yml b/tnet/host_vars/knot/tnet.yml
deleted file mode 100644
index 4c30fb5..0000000
--- a/tnet/host_vars/knot/tnet.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-tnet_links:
-  hash: 
-    port: 51001
-    endpoint: hash.trygvis.io:51001
-    address: fdb1:4242:3538:ffff:410b:dabe:1a0d:6842
-  lhn2ix:
-    port: 51002
-    address: fdb1:4242:3538:ffff:18b7:d3ec:5608:db9a
-  kv24ix:
-    port: 51003
-    address: fdb1:4242:3538:ffff:ea4:11cb:863:5252
-  akili:
-    port: 51004
-    address: fdb1:4242:3538:ffff:59d7:cf77:8b5d:761a
diff --git a/tnet/host_vars/knot/wg.yml b/tnet/host_vars/knot/wg.yml
new file mode 100644
index 0000000..d12592a
--- /dev/null
+++ b/tnet/host_vars/knot/wg.yml
@@ -0,0 +1,14 @@
+tnet_wg:
+  hash: 
+    port: 51001
+    endpoint: hash.trygvis.io:51001
+    address: fdb1:4242:3538:ffff:410b:dabe:1a0d:6842
+  lhn2ix:
+    port: 51002
+    address: fdb1:4242:3538:ffff:18b7:d3ec:5608:db9a
+  kv24ix:
+    port: 51003
+    address: fdb1:4242:3538:ffff:ea4:11cb:863:5252
+  akili:
+    port: 51004
+    address: fdb1:4242:3538:ffff:59d7:cf77:8b5d:761a
diff --git a/tnet/host_vars/kv24ix/tnet.yml b/tnet/host_vars/kv24ix/tnet.yml
deleted file mode 100644
index 93b8e5e..0000000
--- a/tnet/host_vars/kv24ix/tnet.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-tnet_links:
-  knot:
diff --git a/tnet/host_vars/kv24ix/wg.yml b/tnet/host_vars/kv24ix/wg.yml
new file mode 100644
index 0000000..9cfdc5d
--- /dev/null
+++ b/tnet/host_vars/kv24ix/wg.yml
@@ -0,0 +1,2 @@
+tnet_wg:
+  knot:
diff --git a/tnet/host_vars/lhn2ix/tnet.yml b/tnet/host_vars/lhn2ix/tnet.yml
deleted file mode 100644
index 93b8e5e..0000000
--- a/tnet/host_vars/lhn2ix/tnet.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-tnet_links:
-  knot:
diff --git a/tnet/host_vars/lhn2ix/wg.yml b/tnet/host_vars/lhn2ix/wg.yml
new file mode 100644
index 0000000..9cfdc5d
--- /dev/null
+++ b/tnet/host_vars/lhn2ix/wg.yml
@@ -0,0 +1,2 @@
+tnet_wg:
+  knot:
diff --git a/tnet/wg-keys.yml b/tnet/wg-keys.yml
index 0d0fd23..1979619 100644
--- a/tnet/wg-keys.yml
+++ b/tnet/wg-keys.yml
@@ -9,5 +9,5 @@
 #          ansible_host={{ ansible_host }}
 #          inventory_hostname={{ inventory_hostname }}
     - name: Create Wireguard keys
-      loop: "{{ tnet_links|default([])|dict2items }}"
+      loop: "{{ tnet_wg|default([])|dict2items }}"
       include_tasks: wg-keys-genkey.yml
diff --git a/tnet/wg-links.yml b/tnet/wg-links.yml
index 7ed723f..a050547 100644
--- a/tnet/wg-links.yml
+++ b/tnet/wg-links.yml
@@ -1,7 +1,7 @@
 - name: Install Wireguard links
   hosts: tnet
   tasks:
-    - loop: "{{ tnet_links|default([])|dict2items }}"
+    - loop: "{{ tnet_wg|default([])|dict2items }}"
       include_tasks: wg-links-link.yml
   handlers:
     # Has to be restart for now, hash doesn't support reloading networkd
-- 
cgit v1.2.3