external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #190 from iiab/master

Browse source 
sync from iiab/iiab
This commit is contained in:
A Holt 2018-12-26 10:58:03 -05:00 • committed by GitHub
commit 12a47a3861
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
iiab-install
View file

@ -10,7 +10,7 @@ CWD=`pwd`
OS=`grep ^ID= /etc/*release|cut -d= -f2` OS=`grep ^ID= /etc/*release|cut -d= -f2`
OS=${OS//\"/} OS=${OS//\"/}
MIN_RPI_KERN=4.9.59-v7+ 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 if [ ! -f /etc/iiab/local_vars.yml ]; then

2
roles/captive-portal/templates/iiab-catch
View file

@ -2,7 +2,7 @@
# substitute our own server to catch OS connectivity checking URL's # substitute our own server to catch OS connectivity checking URL's
systemctl stop {{ apache_service }} systemctl stop {{ apache_service }}
systemctl stop captive-portal # systemctl stop captive-portal
echo address=/#/172.18.96.1 > /etc/dnsmasq.d/capture echo address=/#/172.18.96.1 > /etc/dnsmasq.d/capture
/opt/iiab/captive-portal/capture-wsgi.py -d & /opt/iiab/captive-portal/capture-wsgi.py -d &
# write the pid just started # write the pid just started

2
roles/captive-portal/templates/iiab-uncatch
View file

@ -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 "#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 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 awk '{print("ServerAlias ",$1)}' /opt/iiab/captive-portal/checkurls > /etc/apache2/capture
systemctl start captive-portal # systemctl start captive-portal
systemctl start {{ apache_service }} systemctl start {{ apache_service }}

2
scripts/ansible
View file

@ -1,7 +1,7 @@
#!/bin/bash -e #!/bin/bash -e
CURR_VER="undefined" # Ansible version you currently have installed 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 # On other OS's we attempt the latest from PPA, which might be more recent
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive

2
scripts/ansible-2.6.x
View file

@ -1,7 +1,7 @@
#!/bin/bash -e #!/bin/bash -e
CURR_VER="undefined" # Ansible version you currently have installed 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 # On other OS's we attempt the latest from PPA, which might be more recent
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive

2
scripts/ansible-2.7.x
View file

@ -1,7 +1,7 @@
#!/bin/bash -e #!/bin/bash -e
CURR_VER="undefined" # Ansible version you currently have installed 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 # On other OS's we attempt the latest from PPA, which might be more recent
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive