diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2024-08-16 23:20:51 +0200 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2024-08-16 23:20:51 +0200 |
| commit | 7dcb7709dff6b11c9415498b2a8c2a1b3651edd1 (patch) | |
| tree | 33dbe5bf79195b99f74a8a731afc8122b7731109 | |
| parent | ad25e02d5bf7bfadb0ac160c37e9f06adfe15a68 (diff) | |
| download | infra-7dcb7709dff6b11c9415498b2a8c2a1b3651edd1.tar.gz infra-7dcb7709dff6b11c9415498b2a8c2a1b3651edd1.tar.bz2 infra-7dcb7709dff6b11c9415498b2a8c2a1b3651edd1.tar.xz infra-7dcb7709dff6b11c9415498b2a8c2a1b3651edd1.zip | |
Better link naming.
| -rw-r--r-- | tnet/host_vars/hash/wg.yml | 3 | ||||
| -rw-r--r-- | tnet/host_vars/knot/wg.yml | 3 | ||||
| -rw-r--r-- | tnet/keys/wg-conflatorio-hash.pub (renamed from tnet/keys/wg-confltrio-hash.pub) | 0 | ||||
| -rw-r--r-- | tnet/keys/wg-conflatorio-knot.pub (renamed from tnet/keys/wg-confltrio-knot.pub) | 0 | ||||
| -rw-r--r-- | tnet/keys/wg-hash-conflatorio.sops.key (renamed from tnet/keys/wg-hash-confltrio.sops.key) | 0 | ||||
| -rw-r--r-- | tnet/keys/wg-knot-conflatorio.sops.key (renamed from tnet/keys/wg-knot-confltrio.sops.key) | 0 | ||||
| -rw-r--r-- | tnet/wg-links-link.yml | 4 |
7 files changed, 7 insertions, 3 deletions
diff --git a/tnet/host_vars/hash/wg.yml b/tnet/host_vars/hash/wg.yml index 3f46aec..5754f57 100644 --- a/tnet/host_vars/hash/wg.yml +++ b/tnet/host_vars/hash/wg.yml @@ -19,6 +19,7 @@ tnet_wg: node2: port: 51006 address: fe80:a7a6:c1a8:c261:232e:7d67:fc27:7c8c - confltrio: + conflatorio: + if_name: confltrio port: 51007 address: fe80:4540:476c:d432:2f32:818b:811b:bb61 diff --git a/tnet/host_vars/knot/wg.yml b/tnet/host_vars/knot/wg.yml index 18914d7..b382831 100644 --- a/tnet/host_vars/knot/wg.yml +++ b/tnet/host_vars/knot/wg.yml @@ -30,6 +30,7 @@ tnet_wg: port: 51009 address: fe80::621b:7ccf:ff44:c42c endpoint: router.lon1.routedbits.com:53538 - confltrio: + conflatorio: + if_name: confltrio port: 51010 address: fe80:47fc:0660:b91f:1063:a6ae:46bb:7589 diff --git a/tnet/keys/wg-confltrio-hash.pub b/tnet/keys/wg-conflatorio-hash.pub index 8a27ee5..8a27ee5 100644 --- a/tnet/keys/wg-confltrio-hash.pub +++ b/tnet/keys/wg-conflatorio-hash.pub diff --git a/tnet/keys/wg-confltrio-knot.pub b/tnet/keys/wg-conflatorio-knot.pub index 053a7d6..053a7d6 100644 --- a/tnet/keys/wg-confltrio-knot.pub +++ b/tnet/keys/wg-conflatorio-knot.pub diff --git a/tnet/keys/wg-hash-confltrio.sops.key b/tnet/keys/wg-hash-conflatorio.sops.key index c78eebc..c78eebc 100644 --- a/tnet/keys/wg-hash-confltrio.sops.key +++ b/tnet/keys/wg-hash-conflatorio.sops.key diff --git a/tnet/keys/wg-knot-confltrio.sops.key b/tnet/keys/wg-knot-conflatorio.sops.key index 4565d73..4565d73 100644 --- a/tnet/keys/wg-knot-confltrio.sops.key +++ b/tnet/keys/wg-knot-conflatorio.sops.key diff --git a/tnet/wg-links-link.yml b/tnet/wg-links-link.yml index 6f1bb87..632024e 100644 --- a/tnet/wg-links-link.yml +++ b/tnet/wg-links-link.yml @@ -7,6 +7,8 @@ - name: "Make netdev for {{ inventory_hostname }} -> {{ item.key }}" notify: systemctl restart systemd-networkd become: yes + vars: + if_name: tnet-{{ item.if_name|default(item.key) }} copy: dest: "/etc/systemd/network/50-tnet-{{ item.key }}.netdev" owner: systemd-network @@ -14,7 +16,7 @@ mode: 0640 content: | [NetDev] - Name=tnet-{{ item.key }} + Name={{ if_name }} Kind=wireguard Description=tnet link to {{ item.key }} |