From a8d06c83a539b7bb33e048272ad7001e9aaad7c4 Mon Sep 17 00:00:00 2001 From: binary Date: Sat, 5 Dec 2020 17:50:43 +0100 Subject: Migrate wireguard service in wireguard role --- playbooks/network.yml | 9 --------- roles/wireguard/tasks/main.yml | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/playbooks/network.yml b/playbooks/network.yml index 69cf59f..1e8206b 100644 --- a/playbooks/network.yml +++ b/playbooks/network.yml @@ -16,15 +16,6 @@ - hosts: servers roles: - - - role: rc - vars: - rc_cmd: "{{ path_wgquick }}" - rc_args: "up {{ global.dcontroller }}" - rc_name: wireguard - rc_user: "{{ user_root }}" - ignore_errors: true - - { role: dns } - { role: sshd } diff --git a/roles/wireguard/tasks/main.yml b/roles/wireguard/tasks/main.yml index 51b97c0..5ae3a97 100644 --- a/roles/wireguard/tasks/main.yml +++ b/roles/wireguard/tasks/main.yml @@ -54,6 +54,30 @@ - { name: "{{ ansible_host }}", path: /etc/wireguard/dcontroller.conf } - { name: localhost, path: "{{ wg_dir }}/{{ ansible_host }}.conf" } +- name: enable wireguard for freebsd + lineinfile: + path: /etc/rc.conf + regexp: "^wireguard_enable" + line: wireguard_enable="YES" + when: os_distribution == "freebsd" + +- name: enable interface for freebsd + lineinfile: + path: /etc/rc.conf + regexp: "^wireguard_interfaces" + line: wireguard_interfaces="{{ global.dcontroller }}" + when: os_distribution == "freebsd" + +- name: generate and enable init script + include_role: name=rc + vars: + rc_cmd: "{{ path_wgquick }}" + rc_args: "up {{ global.dcontroller }}" + rc_name: wireguard + rc_user: "{{ user_root }}" + ignore_errors: true + when: os_distribution != "freebsd" + - name: generate server interface template: src: templates/hostname.j2 -- cgit v1.2.3