From ed244b45c97c6a8d9e7b9a564e47649d8b3c75b1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 15 Aug 2018 23:36:03 -0400 Subject: [PATCH 1/3] Update announcer.j2 --- roles/openvpn/templates/announcer.j2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/roles/openvpn/templates/announcer.j2 b/roles/openvpn/templates/announcer.j2 index 8b4abaf96..080666064 100755 --- a/roles/openvpn/templates/announcer.j2 +++ b/roles/openvpn/templates/announcer.j2 @@ -8,7 +8,12 @@ if [ -f /etc/iiab/openvpn_handle ]; then # Option #1 HANDLE=`cat /etc/iiab/openvpn_handle` # Option #2: UUID is later used, if openvpn_handle is not set -# Sourcing a variable from ~4 different places is a recipe for total confusion (or worse!) + +# Sourcing a variable from ~4 different places is a recipe for total confusion +# (or worse!) Far better to make variable openvpn_handle and file +# /etc/iiab/openvpn_handle "mandatory" (EMPTY STRING "" IS TOLERATED, in which +# case OpenVPN server should use /etc/iiab/uuid in lieu of the handle). + #else # # Option #3: Dangerous to invoke hypothetical variables :( # source /etc/iiab/iiab.env From 7285eabcc5a7c06710380e42ede97a2fc3d70331 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 15 Aug 2018 23:38:32 -0400 Subject: [PATCH 2/3] Update announcer.j2 --- roles/openvpn/templates/announcer.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/openvpn/templates/announcer.j2 b/roles/openvpn/templates/announcer.j2 index 080666064..61b0d5203 100755 --- a/roles/openvpn/templates/announcer.j2 +++ b/roles/openvpn/templates/announcer.j2 @@ -11,7 +11,7 @@ if [ -f /etc/iiab/openvpn_handle ]; then # Sourcing a variable from ~4 different places is a recipe for total confusion # (or worse!) Far better to make variable openvpn_handle and file -# /etc/iiab/openvpn_handle "mandatory" (EMPTY STRING "" IS TOLERATED, in which +# /etc/iiab/openvpn_handle "obligatory" (EMPTY STRING "" IS TOLERATED, in which # case OpenVPN server should use /etc/iiab/uuid in lieu of the handle). #else From 667fe3dede438bb00d5c6f8ee3e9630f078cc557 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 15 Aug 2018 23:41:04 -0400 Subject: [PATCH 3/3] Update announcer.j2 --- roles/openvpn/templates/announcer.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/openvpn/templates/announcer.j2 b/roles/openvpn/templates/announcer.j2 index 61b0d5203..0b4a10a63 100755 --- a/roles/openvpn/templates/announcer.j2 +++ b/roles/openvpn/templates/announcer.j2 @@ -14,6 +14,9 @@ if [ -f /etc/iiab/openvpn_handle ]; then # /etc/iiab/openvpn_handle "obligatory" (EMPTY STRING "" IS TOLERATED, in which # case OpenVPN server should use /etc/iiab/uuid in lieu of the handle). +# CLARIF: "systemctl restart openvpn@xscenet" still runs even if the above is +# defied. e.g. if an implementer deletes /etc/iiab/openvpn_handle by accident. + #else # # Option #3: Dangerous to invoke hypothetical variables :( # source /etc/iiab/iiab.env