diff --git a/roles/captiveportal/templates/capture-wsgi.py b/roles/captiveportal/templates/capture-wsgi.py index fb0e2d5e4..562773597 100755 --- a/roles/captiveportal/templates/capture-wsgi.py +++ b/roles/captiveportal/templates/capture-wsgi.py @@ -205,10 +205,10 @@ def android(environ, start_response): def android_splash(environ, start_response): en_txt={ 'message':"Click on the button to go to the IIAB home page",\ 'btn1':"GO TO IIAB HOME PAGE", \ - "FQDN": fully_qualified_domain_name, \ + "FQDN": fully_qualified_domain_name + '{{ captiveportal_splash_page }}', \ 'doc_root':get_iiab_env("WWWROOT") } es_txt={ 'message':"Haga clic en el botón para ir a la página de inicio de IIAB",\ - "FQDN": fully_qualified_domain_name, \ + "FQDN": fully_qualified_domain_name, + '{{ captiveportal_splash_page }}' \ 'btn1':"IIAB",'doc_root':get_iiab_env("WWWROOT")} txt = en_txt if lang == "en": @@ -227,10 +227,10 @@ def android_https(environ, start_response): en_txt={ 'message':"""Please ignore the SECURITY warning which appears after clicking the first button""",\ 'btn2':'Click this first Go to the browser we need',\ 'btn1':'Then click this to go to IIAB home page',\ - "FQDN": fully_qualified_domain_name, \ + "FQDN": fully_qualified_domain_name + '{{ captiveportal_splash_page }}', \ 'doc_root':get_iiab_env("WWWROOT") } es_txt={ 'message':"Haga clic en el botón para ir a la página de inicio de IIAB",\ - "FQDN": fully_qualified_domain_name, \ + "FQDN": fully_qualified_domain_name + '{{ captiveportal_splash_page }}', \ 'btn1':"IIAB",'doc_root':get_iiab_env("WWWROOT")} txt = en_txt if lang == "en": @@ -250,10 +250,10 @@ def mac_splash(environ,start_response): logger.debug("in function mac_splash") en_txt={ 'message': "Click on the button to go to the IIAB home page",\ 'btn1': "GO TO IIAB HOME PAGE",'success_token': 'Success', - "FQDN": fully_qualified_domain_name, \ + "FQDN": fully_qualified_domain_name + '{{ captiveportal_splash_page }}', \ 'doc_root':get_iiab_env("WWWROOT")} es_txt={ 'message':"Haga clic en el botón para ir a la página de inicio de IIAB",\ - "FQDN": fully_qualified_domain_name, \ + "FQDN": fully_qualified_domain_name + '{{ captiveportal_splash_page }}', \ 'btn1':"IIAB",'doc_root':get_iiab_env("WWWROOT")} txt = en_txt if lang == "en": diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 8a6178e1f..0315e77d5 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -84,6 +84,7 @@ dns_jail_enabled: False # extensively refined later in 2018 (PRs #1179, #1300, #1327). captiveportal_install: False captiveportal_enabled: False +captiveportal_splash_page: / # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO # Bluetooth PAN access to IIAB server diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index c64384b43..225ab4953 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -84,6 +84,7 @@ dns_jail_enabled: False # extensively refined later in 2018 (PRs #1179, #1300, #1327). captiveportal_install: False captiveportal_enabled: False +captiveportal_splash_page: / # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO # Bluetooth PAN access to IIAB server diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 62b434f91..6e19410ee 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -84,6 +84,7 @@ dns_jail_enabled: False # extensively refined later in 2018 (PRs #1179, #1300, #1327). captiveportal_install: False captiveportal_enabled: False +captiveportal_splash_page: / # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO # Bluetooth PAN access to IIAB server