From 6e1c3b33fb1c5b073c9bd69ef9fd5c4538fcfeff Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 25 May 2021 16:05:27 -0400 Subject: [PATCH 1/3] Update iiab-support --- iiab-support | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-support b/iiab-support index 66c8e54ae..c61656aa6 100755 --- a/iiab-support +++ b/iiab-support @@ -46,7 +46,7 @@ else echo -e "\n\e[1mWARNING: openvpn_handle remains unchanged in both above files.\e[0m\n" fi -if grep -q '^openvpn_install: True' /etc/iiab/local_vars.yml; then +if grep -q '^openvpn_installed: True' /etc/iiab/iiab_state.yml; then echo -e "Your IIAB installation appears normal, with OpenVPN already installed...\n" else echo -e "Plz wait a few minutes as sshd, iiab-admin & OpenVPN are confirmed/installed...\n" From 7799c84bd7e6abce39438b09095c57d6082de1ca Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 25 May 2021 16:15:57 -0400 Subject: [PATCH 2/3] Update iiab-support --- iiab-support | 2 -- 1 file changed, 2 deletions(-) diff --git a/iiab-support b/iiab-support index c61656aa6..11ff589d9 100755 --- a/iiab-support +++ b/iiab-support @@ -58,8 +58,6 @@ else if [ -d /opt/iiab/iiab ]; then cd /opt/iiab/iiab - #CWD=`pwd` - #export ANSIBLE_LOG_PATH="$CWD/iiab-install.log" export ANSIBLE_LOG_PATH="/opt/iiab/iiab/iiab-install.log" ansible -m setup -i $INVENTORY localhost --connection=local | grep python ansible-playbook -i $INVENTORY $PLAYBOOK --connection=local From 29cdf2ff1135583f288582bb0e4cd5ef7e1b49b1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 25 May 2021 16:41:11 -0400 Subject: [PATCH 3/3] iiab-support: Check for word break using '\b' (grep -q '^openvpn_installed: True\b' /etc/iiab/iiab_state.yml) --- iiab-support | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-support b/iiab-support index 11ff589d9..91ec00a7d 100755 --- a/iiab-support +++ b/iiab-support @@ -46,7 +46,7 @@ else echo -e "\n\e[1mWARNING: openvpn_handle remains unchanged in both above files.\e[0m\n" fi -if grep -q '^openvpn_installed: True' /etc/iiab/iiab_state.yml; then +if grep -q '^openvpn_installed: True\b' /etc/iiab/iiab_state.yml; then echo -e "Your IIAB installation appears normal, with OpenVPN already installed...\n" else echo -e "Plz wait a few minutes as sshd, iiab-admin & OpenVPN are confirmed/installed...\n"