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

get the changes tied down a little

Browse source
This commit is contained in:
George Hunt 2019-12-22 04:11:42 +00:00
parent caf1a250c5
commit 6998f0c030
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/captiveportal/templates/captiveportal.ini.j2
View file

@ -1,10 +1,10 @@
[uwsgi] [uwsgi]
uid = {{ apache_user }} uid = {{ apache_user }}
gid = {{ apache_user }} gid = {{ apache_user }}
http-socket = {{ captiveportal_port }} http-socket = :{{ captiveportal_port }}
chdir = /opt/iiab/captiveportal chdir = /opt/iiab/captiveportal
wsgi-file = capture-wsgi.py wsgi-file = capture-wsgi.py
master = true master = true
plugins = python3 plugins = python3
log-to = /var/log/apache2/captiveportal.log log-to = /var/log/apache2/portal.log
py-autoreload = 2 py-autoreload = 2

4
roles/captiveportal/templates/capture-wsgi.py
View file

@ -39,7 +39,8 @@ doc_root = get_iiab_env("WWWROOT")
fully_qualified_domain_name = get_iiab_env("FQDN") fully_qualified_domain_name = get_iiab_env("FQDN")
loggingLevel = "ERROR" #loggingLevel = "ERROR"
loggingLevel = "DEBUG"
if len(sys.argv) > 1: if len(sys.argv) > 1:
if sys.argv[1] == '-l': if sys.argv[1] == '-l':
loggingLevel = "DEBUG" loggingLevel = "DEBUG"
@ -156,7 +157,6 @@ def microsoft(environ,start_response):
if agent.startswith('Mozilla'): if agent.startswith('Mozilla'):
logger.debug("sending microsoft redirect for agent Mozilla") logger.debug("sending microsoft redirect for agent Mozilla")
return home(environ, start_response) return home(environ, start_response)
logger.debug("sending microsoft redirect")
response_body = b"" response_body = b""
status = '302 Moved Temporarily' status = '302 Moved Temporarily'
response_headers = [('Location','http://' + fully_qualified_domain_name + '{{ captiveportal_splash_page }}'), response_headers = [('Location','http://' + fully_qualified_domain_name + '{{ captiveportal_splash_page }}'),

1
vars/default_vars.yml
View file

@ -147,6 +147,7 @@ dns_jail_enabled: False
captiveportal_install: False captiveportal_install: False
captiveportal_enabled: False captiveportal_enabled: False
captiveportal_port: 9090 captiveportal_port: 9090
captiveportal_splash_page: /
# In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO
# Bluetooth PAN access to IIAB server # Bluetooth PAN access to IIAB server