From f935ab615c7061742062552d279fe19ac729c11c Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Dec 2018 11:38:03 -0500 Subject: [PATCH 01/11] Update default_vars.yml --- vars/default_vars.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 6944d1189..fb5088513 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -116,11 +116,11 @@ dns_jail_enabled: False # Python-based Captive Portal, that @m-anish & @jvonau experimented with in # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt -# extensively refined in Sept 2018 (https://github.com/iiab/iiab/pull/1179) +# extensively refined later in 2018 (PRs #1179, #1300). captive_portal_install: True captive_portal_enabled: True captive_portal_port: 9090 -# In a pinch, disable it by running: systemctl disable captive-portal +# In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO # Set to "False" if you want to revert to the older Dynamic Menuing system # (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu) From 52efe6391c1f6e186b7225b485c073d3200c3771 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Dec 2018 11:38:39 -0500 Subject: [PATCH 02/11] Update local_vars_min.yml --- vars/local_vars_min.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index ccafcaf3d..0c54554ba 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -57,10 +57,10 @@ dns_jail_enabled: False # Python-based Captive Portal, that @m-anish & @jvonau experimented with in # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt -# extensively refined in Sept 2018 (https://github.com/iiab/iiab/pull/1179) +# extensively refined later in 2018 (PRs #1179, #1300). captive_portal_install: True captive_portal_enabled: True -# In a pinch, disable it by running: systemctl disable captive-portal +# In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO # Set to "False" if you want to revert to the older Dynamic Menuing system # (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu) From 657d8b74cd946021339db8c5bb71bbd9f25740ea Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Dec 2018 11:39:18 -0500 Subject: [PATCH 03/11] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 8288971d2..bfe7fb9bc 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -57,10 +57,10 @@ dns_jail_enabled: False # Python-based Captive Portal, that @m-anish & @jvonau experimented with in # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt -# extensively refined in Sept 2018 (https://github.com/iiab/iiab/pull/1179) +# extensively refined later in 2018 (PRs #1179, #1300). captive_portal_install: True captive_portal_enabled: True -# In a pinch, disable it by running: systemctl disable captive-portal +# In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO # Set to "False" if you want to revert to the older Dynamic Menuing system # (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu) From df38a2f8656d6bc5fb6040d60c85fb00148116d7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Dec 2018 11:39:58 -0500 Subject: [PATCH 04/11] Update local_vars_big.yml --- vars/local_vars_big.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 1bae5a90c..94452cc14 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -57,10 +57,10 @@ dns_jail_enabled: False # Python-based Captive Portal, that @m-anish & @jvonau experimented with in # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt -# extensively refined in Sept 2018 (https://github.com/iiab/iiab/pull/1179) +# extensively refined later in 2018 (PRs #1179, #1300). captive_portal_install: True captive_portal_enabled: True -# In a pinch, disable it by running: systemctl disable captive-portal +# In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO # Set to "False" if you want to revert to the older Dynamic Menuing system # (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu) From 607d9f7c361c66e105e4763b648b60a2996817e7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Dec 2018 11:42:37 -0500 Subject: [PATCH 05/11] Update local_vars_big.yml --- vars/local_vars_big.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 94452cc14..78f1baf98 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -57,7 +57,7 @@ dns_jail_enabled: False # Python-based Captive Portal, that @m-anish & @jvonau experimented with in # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt -# extensively refined later in 2018 (PRs #1179, #1300). +# extensively refined later in 2018 (PRs #1179, #1300, #1327). captive_portal_install: True captive_portal_enabled: True # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO From 304f3a26ee56ff562a9155028562785a2b6b86d4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Dec 2018 11:42:54 -0500 Subject: [PATCH 06/11] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index bfe7fb9bc..a70758e7f 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -57,7 +57,7 @@ dns_jail_enabled: False # Python-based Captive Portal, that @m-anish & @jvonau experimented with in # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt -# extensively refined later in 2018 (PRs #1179, #1300). +# extensively refined later in 2018 (PRs #1179, #1300, #1327). captive_portal_install: True captive_portal_enabled: True # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO From 745e179a98db61746a185384f9b4b105348bcc05 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Dec 2018 11:43:18 -0500 Subject: [PATCH 07/11] Update local_vars_min.yml --- vars/local_vars_min.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 0c54554ba..4a2ab3bcf 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -57,7 +57,7 @@ dns_jail_enabled: False # Python-based Captive Portal, that @m-anish & @jvonau experimented with in # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt -# extensively refined later in 2018 (PRs #1179, #1300). +# extensively refined later in 2018 (PRs #1179, #1300, #1327). captive_portal_install: True captive_portal_enabled: True # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO From 33bbd27fd828cd6e6dcacb86e79d086140b00984 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Dec 2018 11:44:29 -0500 Subject: [PATCH 08/11] Update default_vars.yml --- vars/default_vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index fb5088513..333cf855e 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -116,7 +116,7 @@ dns_jail_enabled: False # Python-based Captive Portal, that @m-anish & @jvonau experimented with in # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt -# extensively refined later in 2018 (PRs #1179, #1300). +# extensively refined later in 2018 (PRs #1179, #1300, #1327). captive_portal_install: True captive_portal_enabled: True captive_portal_port: 9090 From 11682c3f7d6c1899a2dc0040af999ac0d1cdd9a1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Dec 2018 12:34:05 -0500 Subject: [PATCH 09/11] Update main.yml --- roles/captive-portal/tasks/main.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/roles/captive-portal/tasks/main.yml b/roles/captive-portal/tasks/main.yml index 80d97b5ba..514ba64e5 100644 --- a/roles/captive-portal/tasks/main.yml +++ b/roles/captive-portal/tasks/main.yml @@ -6,20 +6,16 @@ - python-dateutil - sqlite3 # @georgehunt hopes to move this to 2-common (or more like stage 3-base-server, alongside MySQL) in October 2018 -- name: Install wsgi (debuntu) +- name: Install libapache2-mod-wsgi (debuntu) package: - name: "{{ item }}" + name: libapache2-mod-wsgi state: present - with_items: - - libapache2-mod-wsgi when: is_debuntu -- name: Install wsgi (not debuntu) +- name: Install mod_wsgi (not debuntu) package: - name: "{{ item }}" + name: mod_wsgi state: present - with_items: - - mod_wsgi when: not is_debuntu - name: Create directory /opt/iiab/captive-portal for scripts & templates @@ -125,8 +121,8 @@ - name: Restart apache2 systemd: - name: apache2 - state: restarted + name: apache2 + state: restarted - name: Restart dnsmasq systemd: From 5a1985aa2852978de3c8fa88ae447f7461ad33e6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Dec 2018 12:34:38 -0500 Subject: [PATCH 10/11] Rename captive-portal.service.j2 to captive-portal.service.j2.deprecated --- ...ive-portal.service.j2 => captive-portal.service.j2.deprecated} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename roles/captive-portal/templates/{captive-portal.service.j2 => captive-portal.service.j2.deprecated} (100%) diff --git a/roles/captive-portal/templates/captive-portal.service.j2 b/roles/captive-portal/templates/captive-portal.service.j2.deprecated similarity index 100% rename from roles/captive-portal/templates/captive-portal.service.j2 rename to roles/captive-portal/templates/captive-portal.service.j2.deprecated From 4c921ce8b0c9f6282f3139223874ba32ec01f512 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Dec 2018 13:27:44 -0500 Subject: [PATCH 11/11] Update main.yml --- roles/captive-portal/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/captive-portal/tasks/main.yml b/roles/captive-portal/tasks/main.yml index 514ba64e5..aa1db0954 100644 --- a/roles/captive-portal/tasks/main.yml +++ b/roles/captive-portal/tasks/main.yml @@ -4,7 +4,7 @@ state: present with_items: - python-dateutil - - sqlite3 # @georgehunt hopes to move this to 2-common (or more like stage 3-base-server, alongside MySQL) in October 2018 + - sqlite3 # @georgejhunt hopes to move this to 2-common (or more likely 3-base-server, alongside MySQL) in October 2018 - name: Install libapache2-mod-wsgi (debuntu) package: