From 0b6fb15be1e15ffe349eb9e54bbd9a19245d33c3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Dec 2018 13:40:38 -0500 Subject: [PATCH 1/6] Update iiab-catch --- roles/captive-portal/templates/iiab-catch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/captive-portal/templates/iiab-catch b/roles/captive-portal/templates/iiab-catch index bc3beb781..a481d6c1b 100755 --- a/roles/captive-portal/templates/iiab-catch +++ b/roles/captive-portal/templates/iiab-catch @@ -2,7 +2,7 @@ # substitute our own server to catch OS connectivity checking URL's systemctl stop {{ apache_service }} -systemctl stop captive-portal +# systemctl stop captive-portal echo address=/#/172.18.96.1 > /etc/dnsmasq.d/capture /opt/iiab/captive-portal/capture-wsgi.py -d & # write the pid just started From 1a46ce2f1d8aa9d8093f2999378ed48a30948699 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Dec 2018 13:41:17 -0500 Subject: [PATCH 2/6] Update iiab-uncatch --- roles/captive-portal/templates/iiab-uncatch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/captive-portal/templates/iiab-uncatch b/roles/captive-portal/templates/iiab-uncatch index c0007fcb6..ee1c30804 100755 --- a/roles/captive-portal/templates/iiab-uncatch +++ b/roles/captive-portal/templates/iiab-uncatch @@ -11,5 +11,5 @@ awk '{print("address=/" $1 "/172.18.96.1")}' /opt/iiab/captive-portal/checkurls echo "#following tells windows 7 that captive portal is active" >>/etc/dnsmasq.d/capture echo "address=/dns.msftncsi.com/131.107.255.255" >> /etc/dnsmasq.d/capture awk '{print("ServerAlias ",$1)}' /opt/iiab/captive-portal/checkurls > /etc/apache2/capture -systemctl start captive-portal +# systemctl start captive-portal systemctl start {{ apache_service }} From 940a30bd45a5afab3e7a79c8f3eaffed2618ff39 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 13 Dec 2018 19:49:27 -0500 Subject: [PATCH 3/6] Update iiab-install --- iiab-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index 057ecf79a..103b35c18 100755 --- a/iiab-install +++ b/iiab-install @@ -10,7 +10,7 @@ CWD=`pwd` OS=`grep ^ID= /etc/*release|cut -d= -f2` OS=${OS//\"/} MIN_RPI_KERN=4.9.59-v7+ -MIN_ANSIBLE_VER=2.6.10 +MIN_ANSIBLE_VER=2.6.11 if [ ! -f /etc/iiab/local_vars.yml ]; then From 00a9f1f195457d93ebafeef26bd0d9cfaff66bd2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 13 Dec 2018 19:50:02 -0500 Subject: [PATCH 4/6] Update ansible --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index d733f1a89..fa8124d77 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -1,7 +1,7 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.7.4" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.7.5" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive From e95d88cfc8bda61c8fe6f4a032f92476f22c7112 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 13 Dec 2018 19:50:14 -0500 Subject: [PATCH 5/6] 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 e4d9c9ab1..72f7d4b0a 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -1,7 +1,7 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.7.4" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.7.5" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive From 92400e87cff70a2aa6f5e523e4aa085014748091 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 13 Dec 2018 19:50:28 -0500 Subject: [PATCH 6/6] Update ansible-2.7.x --- scripts/ansible-2.7.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.7.x b/scripts/ansible-2.7.x index 0d2664bfb..7d1dcef27 100755 --- a/scripts/ansible-2.7.x +++ b/scripts/ansible-2.7.x @@ -1,7 +1,7 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.7.4" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.7.5" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive