From c966d6f99d0d522dd3ccc353f654dfbb26a1802c Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Thu, 17 Dec 2020 20:46:41 +0100 Subject: [PATCH] Prioritize vpn tasks over other tasks --- roles/arch/handlers/main.yml | 7 ------- roles/arch/tasks/main.yml | 2 +- roles/arch/tasks/openvpn.yml | 9 +++++++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/roles/arch/handlers/main.yml b/roles/arch/handlers/main.yml index fd6dc09..581b47c 100644 --- a/roles/arch/handlers/main.yml +++ b/roles/arch/handlers/main.yml @@ -22,13 +22,6 @@ state: stopped enabled: false -- name: restart vpn - become: true - systemd: - name: openvpn-client@zeus - state: restarted - enabled: true - - name: restart user ssh-agent systemd: name: ssh-agent diff --git a/roles/arch/tasks/main.yml b/roles/arch/tasks/main.yml index 8f3657f..d15960d 100644 --- a/roles/arch/tasks/main.yml +++ b/roles/arch/tasks/main.yml @@ -54,11 +54,11 @@ when: platform == "laptop" - include_tasks: systemd.yml +- include_tasks: openvpn.yml - include_tasks: gpg.yml # TODO - include_tasks: git.yml # TODO - include_tasks: mpv.yml - include_tasks: mpd.yml - include_tasks: postgres.yml # TODO - include_tasks: syncthing.yml -- include_tasks: openvpn.yml - include_tasks: timer.yml diff --git a/roles/arch/tasks/openvpn.yml b/roles/arch/tasks/openvpn.yml index 6d4e4db..78b7954 100644 --- a/roles/arch/tasks/openvpn.yml +++ b/roles/arch/tasks/openvpn.yml @@ -45,7 +45,6 @@ src: "{{ platform }}/openvpn/ta.key", dest: "/etc/openvpn/client/zeus/ta.key", } - notify: restart vpn when: platform == "desktop" - name: copy laptop credentials @@ -73,5 +72,11 @@ src: "{{ platform }}/openvpn/ta.key", dest: "/etc/openvpn/client/zeus/ta.key", } - notify: restart vpn when: platform == "laptop" + +- name: restart vpn + become: true + systemd: + name: openvpn-client@zeus + state: restarted + enabled: true