Skip to content

Cap3.1 on NGINX and Python 3 [Captive Portal]#2070

Merged
holta merged 223 commits intoiiab:masterfrom
georgejhunt:cap3.1
Jan 2, 2020
Merged

Cap3.1 on NGINX and Python 3 [Captive Portal]#2070
holta merged 223 commits intoiiab:masterfrom
georgejhunt:cap3.1

Conversation

@georgejhunt
Copy link
Copy Markdown
Contributor

@georgejhunt georgejhunt commented Dec 18, 2019

  1. Smoke tested on Raspbian lite-min.
  2. Functions on android 5.7, Ios, mac, windows 10, fails on windows 7.
  3. Not tested as an upgrade to previous captive-portal -- since the name of the role is changed, there may be detritus folders.

georgejhunt and others added 24 commits December 14, 2019 18:43
@georgejhunt
bring cp changes on top of current HEAD
e4a6df9
@georgejhunt
make-cp-servers writes directly to /etc/nginx/sites-enabled
18a485c
@georgejhunt
dispersed changes
da38382
@georgejhunt
fixes for moving invokation to 9
7c5127e
@georgejhunt
link to config that exists, py3 in capture-wsgi.py, get systemd unit …
931cab4 
…file for admin-console in place
@georgejhunt
so many errors, systemd still not working -- which uwsgi as root does
ea641ba
@georgejhunt
get the uwsgi path correct
e10df5d
@georgejhunt
fix for braces in python3
dae30fa
@georgejhunt
use copy rather than template for uwsgi file with double braces
f6b093d
@georgejhunt
typo formmat
3f29a14
@georgejhunt
clean up logging
e3c7e8f
@georgejhunt
fixed the android sign in to server disapperance
090e2c4
@georgejhunt
return byte string in home_selected
e88029c
@jvonau
nginx - merge usb-lib.conf, modules.conf into iiab.conf
53f31b3
@jvonau
nginx - moved to iiab-admin-console
383f619
@jvonau
nginx - restore iiab_home_url
1e47300
@jvonau
nginx - clean stale conf files
15db4a6
@georgejhunt
do not put uwsgi ini file in apps-enabled
57329d9
@georgejhunt
remove commented out lines
8ad3f76
@georgejhunt
need capture-wsgi as template to soft code port
85577aa
@georgejhunt
Create README.md
32b3753
@georgejhunt
Update README.md
ee6c42e
@georgejhunt
remove unused file
ac80caa
@georgejhunt
remove the copy of removed file
ed3b044
@holta holta added this to the 7.1 milestone Dec 18, 2019
@holta holta changed the title Cap3.1 on nginx and python 3 Cap3.1 on nginx and python 3 [Captive Portal] Dec 18, 2019
@holta
Copy link
Copy Markdown
Member

holta commented Dec 18, 2019 •
edited
Loading

  1. Functions on android 5.7, Ios, mac, windows 10, fails on windows 7.

I assume you mean Android 5 & 7? Alongside iOS, macOS, Windows 10.

Windows 7 (legal or not!) is on almost every client PC in low-income schools like those in Chiapas, Mexico — so we need to face this too — where/when possible.

@holta holta mentioned this pull request Dec 19, 2019
Merged
jvonau
jvonau reviewed Dec 19, 2019
View reviewed changes
Comment thread roles/captiveportal/templates/captiveportal.ini Outdated
@georgejhunt
clean up logging
6ed76a9
@georgejhunt
fixed the android sign in to server disapperance
a2c2520
@georgejhunt
do not put uwsgi ini file in apps-enabled
d0d5783
@georgejhunt
remove commented out lines
c850b6d
@georgejhunt
need capture-wsgi as template to soft code port
e848e0a
@georgejhunt
Create README.md
66e9e22
@georgejhunt
Update README.md
677ba15
@georgejhunt
remove unused file
4acc22d
@georgejhunt
remove the copy of removed file
b10be9c
@georgejhunt
jvonau suggested changes
caf1a25
@georgejhunt
get the changes tied down a little
6998f0c
@georgejhunt
let python declare log file location
1e6f3de
@georgejhunt
one more splash
74fb1a0
@georgejhunt
turn off logging for uwsgi
a506b30
@georgejhunt
center splash for macOS
c5dc744
@georgejhunt
softcode landing page
67aa4f1
@georgejhunt
remove mods to etc.hosts
44b0632
@georgejhunt
home_selected needs content-length, comma in wrong place
e8d4cec
@georgejhunt
clean out ANDROID_TRIGGERED
008ae5d
@georgejhunt
make the home_selected ajax call async:false
60b0a09
@georgejhunt
Merge branch 'cap3.1' of https://github.com/georgejhunt/iiab into cap3.1
8c8e30d
@georgejhunt
windows7 workds
e9b9a5c
@holta
Copy link
Copy Markdown
Member

holta commented Jan 2, 2020

A big thank you to @georgejhunt for beginning to publish a Captive Portal README:
https://github.com/georgejhunt/iiab/blob/cap3.1/roles/captiveportal/README.md

Which will presumably appear here soon:
https://github.com/iiab/iiab/tree/master/roles/captiveportal/README.md
...or possibly here:
https://github.com/iiab/iiab/tree/master/roles/captive-portal/README.md

(Or this could later move to one of our more prominent wikis — which is NOT to say IIAB can solve the world's Captive Portal technical quagmires ever-arising from each new OS/browser/update/etc — BUT just to invite streamlined "technical fieldback" from thoughtful implementers around the globe...)

@holta holta merged commit 64fc29d into iiab:master Jan 2, 2020
@holta holta changed the title Cap3.1 on nginx and python 3 [Captive Portal] Cap3.1 on NGINX and Python 3 [Captive Portal] Jan 2, 2020
@holta
Copy link
Copy Markdown
Member

holta commented Jan 2, 2020

README is now published:

https://github.com/iiab/iiab/blob/master/roles/captiveportal/README.md

(Please all who can test with diverse smartphones/tablets/laptops/browsers/OS's and contact us with any results!)

This was referenced Jan 3, 2020
Closed
Closed
Merged
@holta holta mentioned this pull request Jan 23, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@holta holta holta left review comments

+1 more reviewer

@jvonau jvonau jvonau left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

enhancement

Projects

None yet

Milestone

7.1

Development

Successfully merging this pull request may close these issues.

4 participants

@georgejhunt @holta @jvonau @tim-moody