Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
holta merged 223 commits into from
Jan 2, 2020
Merged

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

Changes from 3 commits
Commits
Show all changes
223 commits
Select commit Hold shift + click to select a range
e4a6df9
bring cp changes on top of current HEAD
georgejhunt Dec 4, 2019
18a485c
make-cp-servers writes directly to /etc/nginx/sites-enabled
georgejhunt Dec 4, 2019
da38382
dispersed changes
georgejhunt Dec 4, 2019
7c5127e
fixes for moving invokation to 9
georgejhunt Dec 5, 2019
931cab4
link to config that exists, py3 in capture-wsgi.py, get systemd unit …
georgejhunt Dec 5, 2019
ea641ba
so many errors, systemd still not working -- which uwsgi as root does
georgejhunt Dec 5, 2019
e10df5d
get the uwsgi path correct
georgejhunt Dec 6, 2019
dae30fa
fix for braces in python3
georgejhunt Dec 6, 2019
f6b093d
use copy rather than template for uwsgi file with double braces
georgejhunt Dec 6, 2019
3f29a14
typo formmat
georgejhunt Dec 6, 2019
e3c7e8f
clean up logging
georgejhunt Dec 14, 2019
090e2c4
fixed the android sign in to server disapperance
georgejhunt Dec 15, 2019
e88029c
return byte string in home_selected
georgejhunt Dec 15, 2019
53f31b3
nginx - merge usb-lib.conf, modules.conf into iiab.conf
jvonau Dec 17, 2019
383f619
nginx - moved to iiab-admin-console
jvonau Dec 17, 2019
1e47300
nginx - restore iiab_home_url
jvonau Dec 17, 2019
15db4a6
nginx - clean stale conf files
jvonau Dec 17, 2019
57329d9
do not put uwsgi ini file in apps-enabled
georgejhunt Dec 17, 2019
8ad3f76
remove commented out lines
georgejhunt Dec 18, 2019
85577aa
need capture-wsgi as template to soft code port
georgejhunt Dec 18, 2019
32b3753
Create README.md
georgejhunt Dec 18, 2019
ee6c42e
Update README.md
georgejhunt Dec 18, 2019
ac80caa
remove unused file
georgejhunt Dec 18, 2019
ed3b044
remove the copy of removed file
georgejhunt Dec 18, 2019
0d6e236
MediaWiki 1.33.1 -> 1.34.0
holta Dec 19, 2019
8ae4e6b
Merge pull request #2071 from holta/mediawiki-1.34.0
holta Dec 19, 2019
4932263
jvonau suggested changes
georgejhunt Dec 19, 2019
b55d540
Merge pull request #2068 from jvonau/home_page
holta Dec 19, 2019
104611f
Calibre-Web 0.6.4 -> master
holta Dec 19, 2019
f79ce9d
Merge pull request #2072 from holta/calibre-web-master
holta Dec 19, 2019
0a3f906
bring cp changes on top of current HEAD
georgejhunt Dec 4, 2019
778d9fd
make-cp-servers writes directly to /etc/nginx/sites-enabled
georgejhunt Dec 4, 2019
652cb4d
dispersed changes
georgejhunt Dec 4, 2019
30e726d
fixes for moving invokation to 9
georgejhunt Dec 5, 2019
f699f20
link to config that exists, py3 in capture-wsgi.py, get systemd unit …
georgejhunt Dec 5, 2019
3bdcf43
so many errors, systemd still not working -- which uwsgi as root does
georgejhunt Dec 5, 2019
7151477
get the uwsgi path correct
georgejhunt Dec 6, 2019
312e249
fix for braces in python3
georgejhunt Dec 6, 2019
cd8df27
use copy rather than template for uwsgi file with double braces
georgejhunt Dec 6, 2019
cd0b295
typo formmat
georgejhunt Dec 6, 2019
638b6f4
clean up logging
georgejhunt Dec 14, 2019
b97b1c5
fixed the android sign in to server disapperance
georgejhunt Dec 15, 2019
c38e718
return byte string in home_selected
georgejhunt Dec 15, 2019
925a593
do not put uwsgi ini file in apps-enabled
georgejhunt Dec 17, 2019
81f2807
remove commented out lines
georgejhunt Dec 18, 2019
a6c9685
need capture-wsgi as template to soft code port
georgejhunt Dec 18, 2019
c1c3c03
Create README.md
georgejhunt Dec 18, 2019
b302774
Update README.md
georgejhunt Dec 18, 2019
ac6619a
remove unused file
georgejhunt Dec 18, 2019
85a0ced
remove the copy of removed file
georgejhunt Dec 18, 2019
21c989b
jvonau suggested changes
georgejhunt Dec 19, 2019
a5ac224
Merge pull request #321 from iiab/master
holta Dec 20, 2019
79e1bb1
http://box shouldn't redirect to http://box//home/
holta Dec 20, 2019
ce03dba
Merge branch 'cap3.1' of https://github.com/georgejhunt/iiab into cap3.1
georgejhunt Dec 20, 2019
7dae9c1
Merge pull request #2074 from holta/nginx-home-page-double-slash
holta Dec 21, 2019
5ebcb46
nodejs_version: 10.x -> 12.x
holta Dec 21, 2019
e342d0a
Merge pull request #2075 from holta/node-12
holta Dec 21, 2019
118e438
Mandate Node.js 12.x for Sugarizer
holta Dec 21, 2019
093a194
Update install.yml
holta Dec 21, 2019
03f297e
Merge pull request #2076 from holta/sugarizer-req-node-12
holta Dec 21, 2019
d0ed8b1
get the changes tied down a little
georgejhunt Dec 22, 2019
afc2147
let python declare log file location
georgejhunt Dec 22, 2019
e6ef953
bring cp changes on top of current HEAD
georgejhunt Dec 4, 2019
e35610a
make-cp-servers writes directly to /etc/nginx/sites-enabled
georgejhunt Dec 4, 2019
ecf1b90
dispersed changes
georgejhunt Dec 4, 2019
5c9354d
fixes for moving invokation to 9
georgejhunt Dec 5, 2019
04eca5c
link to config that exists, py3 in capture-wsgi.py, get systemd unit …
georgejhunt Dec 5, 2019
23f6b68
so many errors, systemd still not working -- which uwsgi as root does
georgejhunt Dec 5, 2019
b93445d
get the uwsgi path correct
georgejhunt Dec 6, 2019
6bd48b1
fix for braces in python3
georgejhunt Dec 6, 2019
93e66a1
use copy rather than template for uwsgi file with double braces
georgejhunt Dec 6, 2019
d488494
typo formmat
georgejhunt Dec 6, 2019
7afed90
clean up logging
georgejhunt Dec 14, 2019
34783ed
fixed the android sign in to server disapperance
georgejhunt Dec 15, 2019
2bdca73
return byte string in home_selected
georgejhunt Dec 15, 2019
8d32e2f
do not put uwsgi ini file in apps-enabled
georgejhunt Dec 17, 2019
bf76b47
remove commented out lines
georgejhunt Dec 18, 2019
8a36fcd
need capture-wsgi as template to soft code port
georgejhunt Dec 18, 2019
004f1fe
Create README.md
georgejhunt Dec 18, 2019
40a56dc
Update README.md
georgejhunt Dec 18, 2019
81d0325
remove unused file
georgejhunt Dec 18, 2019
d3f44dd
remove the copy of removed file
georgejhunt Dec 18, 2019
bda6e18
jvonau suggested changes
georgejhunt Dec 19, 2019
de6e1bb
bring cp changes on top of current HEAD
georgejhunt Dec 4, 2019
faa8132
make-cp-servers writes directly to /etc/nginx/sites-enabled
georgejhunt Dec 4, 2019
de81bba
fixes for moving invokation to 9
georgejhunt Dec 5, 2019
76e79f5
link to config that exists, py3 in capture-wsgi.py, get systemd unit …
georgejhunt Dec 5, 2019
30c2eeb
so many errors, systemd still not working -- which uwsgi as root does
georgejhunt Dec 5, 2019
7855438
get the uwsgi path correct
georgejhunt Dec 6, 2019
68886b6
fix for braces in python3
georgejhunt Dec 6, 2019
533ee7b
use copy rather than template for uwsgi file with double braces
georgejhunt Dec 6, 2019
6cfa332
typo formmat
georgejhunt Dec 6, 2019
3bf9b2d
clean up logging
georgejhunt Dec 14, 2019
763a252
fixed the android sign in to server disapperance
georgejhunt Dec 15, 2019
60bd25a
do not put uwsgi ini file in apps-enabled
georgejhunt Dec 17, 2019
ccacb6f
remove commented out lines
georgejhunt Dec 18, 2019
50ea405
need capture-wsgi as template to soft code port
georgejhunt Dec 18, 2019
29c54a3
Create README.md
georgejhunt Dec 18, 2019
e9e41f7
Update README.md
georgejhunt Dec 18, 2019
8de6c08
remove unused file
georgejhunt Dec 18, 2019
af29712
remove the copy of removed file
georgejhunt Dec 18, 2019
37ac9c7
jvonau suggested changes
georgejhunt Dec 19, 2019
c728ce4
get the changes tied down a little
georgejhunt Dec 22, 2019
4ff8d91
let python declare log file location
georgejhunt Dec 22, 2019
10289e0
one more splash
georgejhunt Dec 22, 2019
40e8106
resolve conflict
georgejhunt Dec 22, 2019
1ffc2aa
turn off logging for uwsgi
georgejhunt Dec 22, 2019
18d253c
center splash for macOS
georgejhunt Dec 22, 2019
445a509
softcode landing page
georgejhunt Dec 23, 2019
baba718
remove mods to etc.hosts
georgejhunt Dec 23, 2019
25ee1b7
home_selected needs content-length, comma in wrong place
georgejhunt Dec 23, 2019
3614252
clean out ANDROID_TRIGGERED
georgejhunt Dec 23, 2019
08dbbbf
make the home_selected ajax call async:false
georgejhunt Dec 24, 2019
730ada8
Merge pull request #322 from iiab/master
holta Dec 26, 2019
643e5ee
phpMyAdmin 4.9.2 -> 5.0.0
holta Dec 26, 2019
7508b77
Merge pull request #2081 from holta/phpmyadmin-5.0.0
holta Dec 26, 2019
52040ef
Moodle 3.7.x -> 3.8.x
holta Dec 28, 2019
b6cc93c
Merge pull request #2085 from holta/moodle-3.8.x
holta Dec 28, 2019
374c63c
convert wp to native nginx
tim-moody Dec 29, 2019
f9adf21
add mediawiki in native nginx
tim-moody Dec 29, 2019
cdef90d
comment out wp and mw from proxy list
tim-moody Dec 29, 2019
35ac04e
fix glitch in osm-vector-maps-nginx.conf
tim-moody Dec 29, 2019
5464f91
fix awstats redirect to cgi without host
tim-moody Dec 29, 2019
131bff8
change dokuwiki url
tim-moody Dec 29, 2019
2888640
kalite - setup.yml needs kalite_install boolean
jvonau Dec 30, 2019
e4eda59
formatting
tim-moody Dec 30, 2019
7361826
Merge pull request #2086 from tim-moody/nginx-conf2
holta Dec 31, 2019
a9e8e3d
Merge pull request #2087 from jvonau/ka-setup
holta Dec 31, 2019
a523477
Lokole 0.5.3 -> 0.5.4
holta Dec 31, 2019
34bf528
Merge pull request #2088 from holta/lokole-0.5.4
holta Dec 31, 2019
2f8636f
bring cp changes on top of current HEAD
georgejhunt Dec 4, 2019
a3f7be3
make-cp-servers writes directly to /etc/nginx/sites-enabled
georgejhunt Dec 4, 2019
fc6c055
dispersed changes
georgejhunt Dec 4, 2019
ca08c44
fixes for moving invokation to 9
georgejhunt Dec 5, 2019
a7d5520
link to config that exists, py3 in capture-wsgi.py, get systemd unit …
georgejhunt Dec 5, 2019
fdb872d
so many errors, systemd still not working -- which uwsgi as root does
georgejhunt Dec 5, 2019
9127dfe
get the uwsgi path correct
georgejhunt Dec 6, 2019
f3a8971
fix for braces in python3
georgejhunt Dec 6, 2019
749c1ac
use copy rather than template for uwsgi file with double braces
georgejhunt Dec 6, 2019
e7f0a1c
typo formmat
georgejhunt Dec 6, 2019
fb2722f
clean up logging
georgejhunt Dec 14, 2019
240012f
fixed the android sign in to server disapperance
georgejhunt Dec 15, 2019
225aa2e
return byte string in home_selected
georgejhunt Dec 15, 2019
b7ea45f
do not put uwsgi ini file in apps-enabled
georgejhunt Dec 17, 2019
1b5f20f
remove commented out lines
georgejhunt Dec 18, 2019
851c91e
need capture-wsgi as template to soft code port
georgejhunt Dec 18, 2019
54c3320
Create README.md
georgejhunt Dec 18, 2019
4007284
Update README.md
georgejhunt Dec 18, 2019
9c8c50b
remove unused file
georgejhunt Dec 18, 2019
dbb9e79
remove the copy of removed file
georgejhunt Dec 18, 2019
ccae50a
jvonau suggested changes
georgejhunt Dec 19, 2019
3f3732f
bring cp changes on top of current HEAD
georgejhunt Dec 4, 2019
9a051f4
make-cp-servers writes directly to /etc/nginx/sites-enabled
georgejhunt Dec 4, 2019
8a32233
fixes for moving invokation to 9
georgejhunt Dec 5, 2019
abb2b9d
link to config that exists, py3 in capture-wsgi.py, get systemd unit …
georgejhunt Dec 5, 2019
8af95a3
so many errors, systemd still not working -- which uwsgi as root does
georgejhunt Dec 5, 2019
e8cf112
get the uwsgi path correct
georgejhunt Dec 6, 2019
a696c8a
fix for braces in python3
georgejhunt Dec 6, 2019
f0e7195
use copy rather than template for uwsgi file with double braces
georgejhunt Dec 6, 2019
4c0821a
typo formmat
georgejhunt Dec 6, 2019
19b51cc
clean up logging
georgejhunt Dec 14, 2019
d4a9bd7
fixed the android sign in to server disapperance
georgejhunt Dec 15, 2019
3eba297
do not put uwsgi ini file in apps-enabled
georgejhunt Dec 17, 2019
c1744af
remove commented out lines
georgejhunt Dec 18, 2019
4e48d2b
need capture-wsgi as template to soft code port
georgejhunt Dec 18, 2019
8d018f6
Create README.md
georgejhunt Dec 18, 2019
aa04891
Update README.md
georgejhunt Dec 18, 2019
d3f6df8
remove unused file
georgejhunt Dec 18, 2019
21cd58e
remove the copy of removed file
georgejhunt Dec 18, 2019
a2a13a3
jvonau suggested changes
georgejhunt Dec 19, 2019
4a3f4af
get the changes tied down a little
georgejhunt Dec 22, 2019
9277a96
let python declare log file location
georgejhunt Dec 22, 2019
c69dd15
bring cp changes on top of current HEAD
georgejhunt Dec 4, 2019
f4ee8fd
make-cp-servers writes directly to /etc/nginx/sites-enabled
georgejhunt Dec 4, 2019
059dcc6
dispersed changes
georgejhunt Dec 4, 2019
e15daa1
fixes for moving invokation to 9
georgejhunt Dec 5, 2019
5614241
link to config that exists, py3 in capture-wsgi.py, get systemd unit …
georgejhunt Dec 5, 2019
447caea
so many errors, systemd still not working -- which uwsgi as root does
georgejhunt Dec 5, 2019
49e4b9e
get the uwsgi path correct
georgejhunt Dec 6, 2019
5804b59
fix for braces in python3
georgejhunt Dec 6, 2019
44c71f2
use copy rather than template for uwsgi file with double braces
georgejhunt Dec 6, 2019
dfed97b
typo formmat
georgejhunt Dec 6, 2019
bff3c06
clean up logging
georgejhunt Dec 14, 2019
96cfed0
fixed the android sign in to server disapperance
georgejhunt Dec 15, 2019
dd4d011
do not put uwsgi ini file in apps-enabled
georgejhunt Dec 17, 2019
c4023b8
remove commented out lines
georgejhunt Dec 18, 2019
96493cb
need capture-wsgi as template to soft code port
georgejhunt Dec 18, 2019
8ac12c6
Create README.md
georgejhunt Dec 18, 2019
b6a048e
Update README.md
georgejhunt Dec 18, 2019
80c2f45
remove unused file
georgejhunt Dec 18, 2019
4325082
remove the copy of removed file
georgejhunt Dec 18, 2019
615c378
jvonau suggested changes
georgejhunt Dec 19, 2019
3540e0c
bring cp changes on top of current HEAD
georgejhunt Dec 4, 2019
885e39e
make-cp-servers writes directly to /etc/nginx/sites-enabled
georgejhunt Dec 4, 2019
e1962b5
fixes for moving invokation to 9
georgejhunt Dec 5, 2019
785c047
link to config that exists, py3 in capture-wsgi.py, get systemd unit …
georgejhunt Dec 5, 2019
32e26fb
so many errors, systemd still not working -- which uwsgi as root does
georgejhunt Dec 5, 2019
5751235
get the uwsgi path correct
georgejhunt Dec 6, 2019
518436b
fix for braces in python3
georgejhunt Dec 6, 2019
4c5b504
use copy rather than template for uwsgi file with double braces
georgejhunt Dec 6, 2019
163c652
typo formmat
georgejhunt Dec 6, 2019
6ed76a9
clean up logging
georgejhunt Dec 14, 2019
a2c2520
fixed the android sign in to server disapperance
georgejhunt Dec 15, 2019
d0d5783
do not put uwsgi ini file in apps-enabled
georgejhunt Dec 17, 2019
c850b6d
remove commented out lines
georgejhunt Dec 18, 2019
e848e0a
need capture-wsgi as template to soft code port
georgejhunt Dec 18, 2019
66e9e22
Create README.md
georgejhunt Dec 18, 2019
677ba15
Update README.md
georgejhunt Dec 18, 2019
4acc22d
remove unused file
georgejhunt Dec 18, 2019
b10be9c
remove the copy of removed file
georgejhunt Dec 18, 2019
caf1a25
jvonau suggested changes
georgejhunt Dec 19, 2019
6998f0c
get the changes tied down a little
georgejhunt Dec 22, 2019
1e6f3de
let python declare log file location
georgejhunt Dec 22, 2019
74fb1a0
one more splash
georgejhunt Dec 22, 2019
a506b30
turn off logging for uwsgi
georgejhunt Dec 22, 2019
c5dc744
center splash for macOS
georgejhunt Dec 22, 2019
67aa4f1
softcode landing page
georgejhunt Dec 23, 2019
44b0632
remove mods to etc.hosts
georgejhunt Dec 23, 2019
e8d4cec
home_selected needs content-length, comma in wrong place
georgejhunt Dec 23, 2019
008ae5d
clean out ANDROID_TRIGGERED
georgejhunt Dec 23, 2019
60b0a09
make the home_selected ajax call async:false
georgejhunt Dec 24, 2019
8c8e30d
Merge branch 'cap3.1' of https://github.com/georgejhunt/iiab into cap3.1
georgejhunt Jan 2, 2020
e9b9a5c
windows7 workds
georgejhunt Jan 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions roles/sugarizer/tasks/install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- name: FAIL (STOP INSTALLING) IF nodejs_version is not set to 10.x
- name: FAIL (STOP INSTALLING) IF nodejs_version is not set to 12.x
fail:
msg: "Sugarizer install cannot proceed, as it currently requires Node.js 10.x, and your nodejs_version is set to {{ nodejs_version }}. Please check the value of nodejs_version in /opt/iiab/iiab/vars/default_vars.yml and possibly also /etc/iiab/local_vars.yml"
when: sugarizer_install and (nodejs_version != "10.x")
msg: "Sugarizer install cannot proceed, as it currently requires Node.js 12.x, and your nodejs_version is set to {{ nodejs_version }}. Please check the value of nodejs_version in /opt/iiab/iiab/vars/default_vars.yml and possibly also /etc/iiab/local_vars.yml"
when: sugarizer_install and (nodejs_version != "12.x")


# 1. DOWNLOAD+LINK /opt/iiab/sugarizer
Expand Down