From 3ea69a9fbb500329102fcc27acf1a848ca57a49d Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 5 Sep 2018 15:04:54 -0400 Subject: [PATCH 1/5] Update iiab-remote-on.j2 --- roles/openvpn/templates/iiab-remote-on.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/openvpn/templates/iiab-remote-on.j2 b/roles/openvpn/templates/iiab-remote-on.j2 index 45c48f228..ff652d402 100644 --- a/roles/openvpn/templates/iiab-remote-on.j2 +++ b/roles/openvpn/templates/iiab-remote-on.j2 @@ -4,7 +4,7 @@ # do nothing if it is not installed which openvpn if [ $? -ne 0 ]; then - echo Cannot find the OpenVPN program (openvpn). + echo 'Cannot find the OpenVPN program (openvpn).' exit 1 fi systemctl enable openvpn@xscenet.service From 8db4f0376e7d84fc5f65d2ff88c2d735e2ecfff2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 5 Sep 2018 15:05:46 -0400 Subject: [PATCH 2/5] legacy syntax errors (bash will not run this on 18.04) --- roles/openvpn/templates/iiab-remote-off | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/openvpn/templates/iiab-remote-off b/roles/openvpn/templates/iiab-remote-off index a5e1b46d3..d99a5dd1a 100644 --- a/roles/openvpn/templates/iiab-remote-off +++ b/roles/openvpn/templates/iiab-remote-off @@ -4,7 +4,7 @@ # do nothing if it is not installed which openvpn if [ $? -ne 0 ]; then - echo Cannot find the OpenVPN program (openvpn). + echo 'Cannot find the OpenVPN program (openvpn).' exit 1 fi systemctl disable openvpn@xscenet.service From 3a48159cf04ed38d030f0fee214d6b0b24dc11c6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 5 Sep 2018 17:49:08 -0400 Subject: [PATCH 3/5] Update ansible-2.6.x --- scripts/ansible-2.6.x | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x index f7dce85a3..5055cce7e 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -40,7 +40,8 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant pip install ansible==$GOOD_VER --disable-pip-version-check # Parens are optional, but greatly clarify :) elif (grep -qi ubuntu /etc/lsb-release 2> /dev/null) || (grep -qi ubuntu /etc/os-release); then - apt -y install python-pip python-setuptools python-wheel patch + #apt -y install python-pip python-setuptools python-wheel patch + apt install software-properties-common #apt-add-repository -y ppa:ansible/ansible apt-add-repository -y ppa:ansible/ansible-2.6 # elif UBUNTU MUST REMAIN ABOVE (as Ubuntu ALSO contains /etc/debian_version, which would trigger the line just below) From eee5183eeb02beb69e8eb3f61f9c4a3b43288813 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 5 Sep 2018 17:49:40 -0400 Subject: [PATCH 4/5] Update ansible --- scripts/ansible | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index f2d43e0d3..a7f867340 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -40,7 +40,8 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant pip install ansible==$GOOD_VER --disable-pip-version-check # Parens are optional, but greatly clarify :) elif (grep -qi ubuntu /etc/lsb-release 2> /dev/null) || (grep -qi ubuntu /etc/os-release); then - apt -y install python-pip python-setuptools python-wheel patch + #apt -y install python-pip python-setuptools python-wheel patch + apt -y install software-properties-common apt-add-repository -y ppa:ansible/ansible #apt-add-repository -y ppa:ansible/ansible-2.4 # elif UBUNTU MUST REMAIN ABOVE (as Ubuntu ALSO contains /etc/debian_version, which would trigger the line just below) From d1690b7a41dbcf289d209a4a3edad8b09611aadb Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 5 Sep 2018 17:49:55 -0400 Subject: [PATCH 5/5] Update ansible-2.6.x --- scripts/ansible-2.6.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x index 5055cce7e..853b6830a 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -41,7 +41,7 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant # Parens are optional, but greatly clarify :) elif (grep -qi ubuntu /etc/lsb-release 2> /dev/null) || (grep -qi ubuntu /etc/os-release); then #apt -y install python-pip python-setuptools python-wheel patch - apt install software-properties-common + apt -y install software-properties-common #apt-add-repository -y ppa:ansible/ansible apt-add-repository -y ppa:ansible/ansible-2.6 # elif UBUNTU MUST REMAIN ABOVE (as Ubuntu ALSO contains /etc/debian_version, which would trigger the line just below)