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 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 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 }} 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 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 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