From f810b9cde68187f24402e9c42f9f32f477ddd017 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 2 Sep 2018 17:08:58 -0400 Subject: [PATCH 1/5] Update xscenet.conf.j2 --- roles/openvpn/templates/xscenet.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/openvpn/templates/xscenet.conf.j2 b/roles/openvpn/templates/xscenet.conf.j2 index 1dc3779f1..c99d8e743 100644 --- a/roles/openvpn/templates/xscenet.conf.j2 +++ b/roles/openvpn/templates/xscenet.conf.j2 @@ -1,4 +1,4 @@ -# Sample client-side OpenVPN config file for connecting to multi-client server. +# Sample client-side OpenVPN config file for connecting to multi-client server # # Adapted from http://openvpn.sourceforge.net/20notes.html # From 370267b1d95a0923c8ea7fba513c11b5c09afc9f Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 2 Sep 2018 17:31:11 -0400 Subject: [PATCH 2/5] Update main.yml --- roles/openvpn/tasks/main.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml index b3e9ff51f..f2ca8c863 100644 --- a/roles/openvpn/tasks/main.yml +++ b/roles/openvpn/tasks/main.yml @@ -154,9 +154,10 @@ # /etc/iiab/openvpn_handle to xscenet.net -- and # "systemctl restart openvpn@xscenet" was failing completely (no matter how # many times it was run) to transmit /etc/iiab/openvpn_handle to xscenet.net -- name: Enable & (Re)Start openvpn@xscenet tunnel +- name: Enable & (Re)Start PARENT service openvpn (it starts CHILD service openvpn@xscenet & tunnel) systemd: - name: openvpn@xscenet.service + name: openvpn + daemon_reload: yes enabled: yes state: restarted when: openvpn_enabled @@ -176,9 +177,9 @@ state: absent when: not openvpn_enabled or not openvpn_cron_enabled -- name: Disable & Stop openvpn@xscenet tunnel +- name: Disable & Stop PARENT service openvpn (it stops CHILD service openvpn@xscenet & tunnel) systemd: - name: openvpn@xscenet.service + name: openvpn enabled: no state: stopped when: not openvpn_enabled From 061047950e14bd044ec9ecedab8bbeaebb84d681 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 2 Sep 2018 17:37:00 -0400 Subject: [PATCH 3/5] Update main.yml --- roles/openvpn/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml index f2ca8c863..da051154c 100644 --- a/roles/openvpn/tasks/main.yml +++ b/roles/openvpn/tasks/main.yml @@ -162,13 +162,13 @@ state: restarted when: openvpn_enabled -- name: Enable hourly cron job for OpenVPN +- name: Enable hourly cron job for OpenVPN (typically for CentOS only?) lineinfile: path: /etc/crontab line: "25 * * * * root (/usr/bin/systemctl start openvpn@xscenet.service) > /dev/null" when: openvpn_enabled and openvpn_cron_enabled -- name: Remove hourly cron job for OpenVPN +- name: Remove hourly cron job for OpenVPN (typically for CentOS only?) lineinfile: path: /etc/crontab regexp: "openvpn@xscenet" @@ -208,7 +208,7 @@ - option: name value: OpenVPN - option: description - value: "OpenVPN is a means of connecting to other machines anywhere on the internet, via a middleman server, using Virtual Private Network techniques to create secure connections." + value: "OpenVPN enables live/remote support by connecting machines anywhere on the Internet, via a middleman server, using Virtual Private Network (VPN) techniques to create secure connections." - option: enabled value: "{{ openvpn_enabled }}" # openvpn_handle variable can no longer be left completely undefined of August 2018 (EMPTY STRING "" IS TOLERATED, in which case OpenVPN server should use /etc/iiab/uuid in lieu of the handle) From 6f9bd1d14f1a0ec203331238d265bbe187605b34 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 2 Sep 2018 17:46:30 -0400 Subject: [PATCH 4/5] Update main.yml --- roles/openvpn/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml index da051154c..3a692efcc 100644 --- a/roles/openvpn/tasks/main.yml +++ b/roles/openvpn/tasks/main.yml @@ -154,7 +154,7 @@ # /etc/iiab/openvpn_handle to xscenet.net -- and # "systemctl restart openvpn@xscenet" was failing completely (no matter how # many times it was run) to transmit /etc/iiab/openvpn_handle to xscenet.net -- name: Enable & (Re)Start PARENT service openvpn (it starts CHILD service openvpn@xscenet & tunnel) +- name: Enable & (Re)Start PARENT service openvpn, which (re)starts CHILD service openvpn@xscenet (& actual tunnel) systemd: name: openvpn daemon_reload: yes @@ -177,7 +177,7 @@ state: absent when: not openvpn_enabled or not openvpn_cron_enabled -- name: Disable & Stop PARENT service openvpn (it stops CHILD service openvpn@xscenet & tunnel) +- name: Disable & Stop PARENT service openvpn, which stops CHILD service openvpn@xscenet (& actual tunnel) systemd: name: openvpn enabled: no From 7a3c05c2129845f796d1c04c3a59adc03274fa15 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 2 Sep 2018 17:58:01 -0400 Subject: [PATCH 5/5] Update main.yml --- roles/openvpn/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml index 3a692efcc..e361834db 100644 --- a/roles/openvpn/tasks/main.yml +++ b/roles/openvpn/tasks/main.yml @@ -162,7 +162,7 @@ state: restarted when: openvpn_enabled -- name: Enable hourly cron job for OpenVPN (typically for CentOS only?) +- name: Enable hourly cron job for OpenVPN (starts CHILD service openvpn@xscenet, typically for CentOS only?) lineinfile: path: /etc/crontab line: "25 * * * * root (/usr/bin/systemctl start openvpn@xscenet.service) > /dev/null"