From e654327704a926ccb292fadf47e2f184b3017771 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 23 Oct 2019 20:26:43 +0200 Subject: rename wirguard role to wireguard/base --- chaos-at-home/ch-mimas2.yml | 2 +- roles/kubernetes/net/kubeguard/meta/main.yml | 2 +- roles/wireguard/base/meta/main.yml | 4 ++++ roles/wireguard/base/tasks/main.yml | 24 ++++++++++++++++++++++++ roles/wireguard/meta/main.yml | 4 ---- roles/wireguard/tasks/main.yml | 24 ------------------------ 6 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 roles/wireguard/base/meta/main.yml create mode 100644 roles/wireguard/base/tasks/main.yml delete mode 100644 roles/wireguard/meta/main.yml delete mode 100644 roles/wireguard/tasks/main.yml diff --git a/chaos-at-home/ch-mimas2.yml b/chaos-at-home/ch-mimas2.yml index dc333f13..755f7697 100644 --- a/chaos-at-home/ch-mimas2.yml +++ b/chaos-at-home/ch-mimas2.yml @@ -8,4 +8,4 @@ - role: admin-user - role: bind - role: acmetool/base - - role: wireguard + - role: wireguard/base diff --git a/roles/kubernetes/net/kubeguard/meta/main.yml b/roles/kubernetes/net/kubeguard/meta/main.yml index 5017b623..39c7d694 100644 --- a/roles/kubernetes/net/kubeguard/meta/main.yml +++ b/roles/kubernetes/net/kubeguard/meta/main.yml @@ -1,4 +1,4 @@ --- dependencies: -- role: wireguard +- role: wireguard/base when: kubeguard_remove_node is not defined diff --git a/roles/wireguard/base/meta/main.yml b/roles/wireguard/base/meta/main.yml new file mode 100644 index 00000000..3542c2fa --- /dev/null +++ b/roles/wireguard/base/meta/main.yml @@ -0,0 +1,4 @@ +--- +dependencies: +- role: prepare-dkms +- role: apt-repo/spreadspace diff --git a/roles/wireguard/base/tasks/main.yml b/roles/wireguard/base/tasks/main.yml new file mode 100644 index 00000000..11761c33 --- /dev/null +++ b/roles/wireguard/base/tasks/main.yml @@ -0,0 +1,24 @@ +--- +- name: install wireguard packages + apt: + name: + - wireguard-dkms + - wireguard-tools + state: present + +- name: check if module is available for the currently running kernel + command: modprobe --dry-run wireguard + check_mode: no + register: wireguard_module_available + failed_when: false + changed_when: false + +- name: rebuild wireguard module + when: wireguard_module_available.rc != 0 + command: dpkg-reconfigure wireguard-dkms + +- name: check again if module is available for the currently running kernel + when: wireguard_module_available.rc != 0 + command: modprobe --dry-run wireguard + check_mode: no + changed_when: false diff --git a/roles/wireguard/meta/main.yml b/roles/wireguard/meta/main.yml deleted file mode 100644 index 3542c2fa..00000000 --- a/roles/wireguard/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: -- role: prepare-dkms -- role: apt-repo/spreadspace diff --git a/roles/wireguard/tasks/main.yml b/roles/wireguard/tasks/main.yml deleted file mode 100644 index 11761c33..00000000 --- a/roles/wireguard/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- name: install wireguard packages - apt: - name: - - wireguard-dkms - - wireguard-tools - state: present - -- name: check if module is available for the currently running kernel - command: modprobe --dry-run wireguard - check_mode: no - register: wireguard_module_available - failed_when: false - changed_when: false - -- name: rebuild wireguard module - when: wireguard_module_available.rc != 0 - command: dpkg-reconfigure wireguard-dkms - -- name: check again if module is available for the currently running kernel - when: wireguard_module_available.rc != 0 - command: modprobe --dry-run wireguard - check_mode: no - changed_when: false -- cgit v1.2.3