diff options
-rw-r--r-- | chaos-at-home/ch-mimas2.yml | 2 | ||||
-rw-r--r-- | dan/ele-gwhetzner.yml | 6 | ||||
-rw-r--r-- | dan/ele-media.yml | 4 | ||||
-rw-r--r-- | roles/kubernetes/kubeadm/base/tasks/net_kubeguard.yml | 2 | ||||
-rw-r--r-- | roles/network/wireguard/base/tasks/main.yml (renamed from roles/wireguard/base/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/network/wireguard/gateway/defaults/main.yml (renamed from roles/wireguard/gateway/defaults/main.yml) | 0 | ||||
-rw-r--r-- | roles/network/wireguard/gateway/handlers/main.yml (renamed from roles/wireguard/gateway/handlers/main.yml) | 0 | ||||
-rw-r--r-- | roles/network/wireguard/gateway/tasks/main.yml (renamed from roles/wireguard/gateway/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/network/wireguard/gateway/templates/systemd-fix-default-gw.service.j2 (renamed from roles/wireguard/gateway/templates/systemd-fix-default-gw.service.j2) | 0 | ||||
-rw-r--r-- | roles/network/wireguard/gateway/templates/systemd-iptables.service.j2 (renamed from roles/wireguard/gateway/templates/systemd-iptables.service.j2) | 0 | ||||
-rw-r--r-- | roles/network/wireguard/gateway/templates/systemd.netdev.j2 (renamed from roles/wireguard/gateway/templates/systemd.netdev.j2) | 0 | ||||
-rw-r--r-- | roles/network/wireguard/gateway/templates/systemd.network.j2 (renamed from roles/wireguard/gateway/templates/systemd.network.j2) | 0 | ||||
-rw-r--r-- | roles/network/wireguard/p2p/defaults/main.yml (renamed from roles/wireguard/p2p/defaults/main.yml) | 0 | ||||
-rw-r--r-- | roles/network/wireguard/p2p/handlers/main.yml (renamed from roles/wireguard/p2p/handlers/main.yml) | 0 | ||||
-rw-r--r-- | roles/network/wireguard/p2p/tasks/main.yml (renamed from roles/wireguard/p2p/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/network/wireguard/p2p/tasks/systemd-iptables.service.j2 (renamed from roles/wireguard/p2p/tasks/systemd-iptables.service.j2) | 0 | ||||
-rw-r--r-- | roles/network/wireguard/p2p/templates/systemd.netdev.j2 (renamed from roles/wireguard/p2p/templates/systemd.netdev.j2) | 0 | ||||
-rw-r--r-- | roles/network/wireguard/p2p/templates/systemd.network.j2 (renamed from roles/wireguard/p2p/templates/systemd.network.j2) | 0 | ||||
-rw-r--r-- | spreadspace/lw-telesto.yml | 2 | ||||
-rw-r--r-- | spreadspace/lw-thetys.yml | 2 | ||||
-rw-r--r-- | spreadspace/s2-thetys.yml | 4 |
21 files changed, 11 insertions, 11 deletions
diff --git a/chaos-at-home/ch-mimas2.yml b/chaos-at-home/ch-mimas2.yml index 1806361b..d5cffd6d 100644 --- a/chaos-at-home/ch-mimas2.yml +++ b/chaos-at-home/ch-mimas2.yml @@ -10,4 +10,4 @@ - role: bind - role: apt-repo/spreadspace - role: acmetool/base - - role: wireguard/base + - role: network/wireguard/base diff --git a/dan/ele-gwhetzner.yml b/dan/ele-gwhetzner.yml index 04824a34..7efdef20 100644 --- a/dan/ele-gwhetzner.yml +++ b/dan/ele-gwhetzner.yml @@ -7,6 +7,6 @@ - role: core/sshd - role: core/zsh - role: apt-repo/spreadspace - - role: wireguard/base - - role: wireguard/gateway - - role: wireguard/p2p + - role: network/wireguard/base + - role: network/wireguard/gateway + - role: network/wireguard/p2p diff --git a/dan/ele-media.yml b/dan/ele-media.yml index f42d7e02..7c92ae66 100644 --- a/dan/ele-media.yml +++ b/dan/ele-media.yml @@ -15,5 +15,5 @@ - role: docker/engine - role: nginx/base - role: elevate/media - - role: wireguard/base - - role: wireguard/gateway + - role: network/wireguard/base + - role: network/wireguard/gateway diff --git a/roles/kubernetes/kubeadm/base/tasks/net_kubeguard.yml b/roles/kubernetes/kubeadm/base/tasks/net_kubeguard.yml index ed5403d3..af609882 100644 --- a/roles/kubernetes/kubeadm/base/tasks/net_kubeguard.yml +++ b/roles/kubernetes/kubeadm/base/tasks/net_kubeguard.yml @@ -16,7 +16,7 @@ - name: install wireguard import_role: - name: wireguard/base + name: network/wireguard/base - name: create network config directory file: diff --git a/roles/wireguard/base/tasks/main.yml b/roles/network/wireguard/base/tasks/main.yml index 4d60150d..4d60150d 100644 --- a/roles/wireguard/base/tasks/main.yml +++ b/roles/network/wireguard/base/tasks/main.yml diff --git a/roles/wireguard/gateway/defaults/main.yml b/roles/network/wireguard/gateway/defaults/main.yml index 69846fc3..69846fc3 100644 --- a/roles/wireguard/gateway/defaults/main.yml +++ b/roles/network/wireguard/gateway/defaults/main.yml diff --git a/roles/wireguard/gateway/handlers/main.yml b/roles/network/wireguard/gateway/handlers/main.yml index 625032dc..625032dc 100644 --- a/roles/wireguard/gateway/handlers/main.yml +++ b/roles/network/wireguard/gateway/handlers/main.yml diff --git a/roles/wireguard/gateway/tasks/main.yml b/roles/network/wireguard/gateway/tasks/main.yml index bc14db1b..bc14db1b 100644 --- a/roles/wireguard/gateway/tasks/main.yml +++ b/roles/network/wireguard/gateway/tasks/main.yml diff --git a/roles/wireguard/gateway/templates/systemd-fix-default-gw.service.j2 b/roles/network/wireguard/gateway/templates/systemd-fix-default-gw.service.j2 index d2d8a470..d2d8a470 100644 --- a/roles/wireguard/gateway/templates/systemd-fix-default-gw.service.j2 +++ b/roles/network/wireguard/gateway/templates/systemd-fix-default-gw.service.j2 diff --git a/roles/wireguard/gateway/templates/systemd-iptables.service.j2 b/roles/network/wireguard/gateway/templates/systemd-iptables.service.j2 index 11cf4b8a..11cf4b8a 100644 --- a/roles/wireguard/gateway/templates/systemd-iptables.service.j2 +++ b/roles/network/wireguard/gateway/templates/systemd-iptables.service.j2 diff --git a/roles/wireguard/gateway/templates/systemd.netdev.j2 b/roles/network/wireguard/gateway/templates/systemd.netdev.j2 index 96399b52..96399b52 100644 --- a/roles/wireguard/gateway/templates/systemd.netdev.j2 +++ b/roles/network/wireguard/gateway/templates/systemd.netdev.j2 diff --git a/roles/wireguard/gateway/templates/systemd.network.j2 b/roles/network/wireguard/gateway/templates/systemd.network.j2 index 6847aa6a..6847aa6a 100644 --- a/roles/wireguard/gateway/templates/systemd.network.j2 +++ b/roles/network/wireguard/gateway/templates/systemd.network.j2 diff --git a/roles/wireguard/p2p/defaults/main.yml b/roles/network/wireguard/p2p/defaults/main.yml index 9d93b810..9d93b810 100644 --- a/roles/wireguard/p2p/defaults/main.yml +++ b/roles/network/wireguard/p2p/defaults/main.yml diff --git a/roles/wireguard/p2p/handlers/main.yml b/roles/network/wireguard/p2p/handlers/main.yml index 625032dc..625032dc 100644 --- a/roles/wireguard/p2p/handlers/main.yml +++ b/roles/network/wireguard/p2p/handlers/main.yml diff --git a/roles/wireguard/p2p/tasks/main.yml b/roles/network/wireguard/p2p/tasks/main.yml index 78cfaf43..78cfaf43 100644 --- a/roles/wireguard/p2p/tasks/main.yml +++ b/roles/network/wireguard/p2p/tasks/main.yml diff --git a/roles/wireguard/p2p/tasks/systemd-iptables.service.j2 b/roles/network/wireguard/p2p/tasks/systemd-iptables.service.j2 index 11cf4b8a..11cf4b8a 100644 --- a/roles/wireguard/p2p/tasks/systemd-iptables.service.j2 +++ b/roles/network/wireguard/p2p/tasks/systemd-iptables.service.j2 diff --git a/roles/wireguard/p2p/templates/systemd.netdev.j2 b/roles/network/wireguard/p2p/templates/systemd.netdev.j2 index 04abfa1d..04abfa1d 100644 --- a/roles/wireguard/p2p/templates/systemd.netdev.j2 +++ b/roles/network/wireguard/p2p/templates/systemd.netdev.j2 diff --git a/roles/wireguard/p2p/templates/systemd.network.j2 b/roles/network/wireguard/p2p/templates/systemd.network.j2 index 3d1e2431..3d1e2431 100644 --- a/roles/wireguard/p2p/templates/systemd.network.j2 +++ b/roles/network/wireguard/p2p/templates/systemd.network.j2 diff --git a/spreadspace/lw-telesto.yml b/spreadspace/lw-telesto.yml index 61f33fe6..62a0348d 100644 --- a/spreadspace/lw-telesto.yml +++ b/spreadspace/lw-telesto.yml @@ -11,4 +11,4 @@ - role: streaming/blackmagic/desktopvideo - role: apt-repo/spreadspace - role: ws/base - - role: wireguard/base + - role: network/wireguard/base diff --git a/spreadspace/lw-thetys.yml b/spreadspace/lw-thetys.yml index c47c72d7..bc35fd90 100644 --- a/spreadspace/lw-thetys.yml +++ b/spreadspace/lw-thetys.yml @@ -12,4 +12,4 @@ - role: streaming/blackmagic/desktopvideo - role: kubernetes/base - role: kubernetes/standalone/base - - role: wireguard/base + - role: network/wireguard/base diff --git a/spreadspace/s2-thetys.yml b/spreadspace/s2-thetys.yml index 44a05609..2a7cd29f 100644 --- a/spreadspace/s2-thetys.yml +++ b/spreadspace/s2-thetys.yml @@ -8,8 +8,8 @@ - role: core/zsh - role: core/cpu-microcode - role: apt-repo/spreadspace - - role: wireguard/base - - role: wireguard/p2p + - role: network/wireguard/base + - role: network/wireguard/p2p - role: zfs/base - role: streaming/blackmagic/desktopvideo - role: kubernetes/base |