aboutsummaryrefslogtreecommitdiff
path: root/tnet
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2024-06-06 19:19:16 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2024-06-06 19:19:16 +0200
commit8799c94364f813062295b02857b39049593990d8 (patch)
tree81bc63eedf57078eb33f9abbe1f7572a3495a437 /tnet
parentbbc0087302ea124ec3d9fc90a47ee610d6e7ee07 (diff)
downloadinfra-8799c94364f813062295b02857b39049593990d8.tar.gz
infra-8799c94364f813062295b02857b39049593990d8.tar.bz2
infra-8799c94364f813062295b02857b39049593990d8.tar.xz
infra-8799c94364f813062295b02857b39049593990d8.zip
tnet
Diffstat (limited to 'tnet')
-rw-r--r--tnet/host_vars/akili/wg.yml (renamed from tnet/host_vars/akili/tnet.yml)2
-rw-r--r--tnet/host_vars/hash/wg.yml (renamed from tnet/host_vars/hash/tnet.yml)2
-rw-r--r--tnet/host_vars/knot/wg.yml (renamed from tnet/host_vars/knot/tnet.yml)2
-rw-r--r--tnet/host_vars/kv24ix/tnet.yml2
-rw-r--r--tnet/host_vars/kv24ix/wg.yml2
-rw-r--r--tnet/host_vars/lhn2ix/tnet.yml2
-rw-r--r--tnet/host_vars/lhn2ix/wg.yml2
-rw-r--r--tnet/wg-keys.yml2
-rw-r--r--tnet/wg-links.yml2
9 files changed, 9 insertions, 9 deletions
diff --git a/tnet/host_vars/akili/tnet.yml b/tnet/host_vars/akili/wg.yml
index b12cc96..b666d8f 100644
--- a/tnet/host_vars/akili/tnet.yml
+++ b/tnet/host_vars/akili/wg.yml
@@ -1,4 +1,4 @@
-tnet_links:
+tnet_wg:
hash:
endpoint: hash.trygvis.io:51002
address: fdb1:4242:3538:ffff:ca85:f812:3935:5fbb
diff --git a/tnet/host_vars/hash/tnet.yml b/tnet/host_vars/hash/wg.yml
index 8246dfd..a82855c 100644
--- a/tnet/host_vars/hash/tnet.yml
+++ b/tnet/host_vars/hash/wg.yml
@@ -1,4 +1,4 @@
-tnet_links:
+tnet_wg:
knot:
port: 51001
endpoint: knot.trygvis.io:51001
diff --git a/tnet/host_vars/knot/tnet.yml b/tnet/host_vars/knot/wg.yml
index 4c30fb5..d12592a 100644
--- a/tnet/host_vars/knot/tnet.yml
+++ b/tnet/host_vars/knot/wg.yml
@@ -1,4 +1,4 @@
-tnet_links:
+tnet_wg:
hash:
port: 51001
endpoint: hash.trygvis.io:51001
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