From ee3d745e728e9cf8e9c6b8b47c0b78e5655fb748 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 26 Feb 2020 11:47:44 -0600 Subject: [PATCH] move calling iiab-divert-to-nginx --- roles/captiveportal/tasks/enable-or-disable.yml | 4 ++++ roles/captiveportal/tasks/install.yml | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/captiveportal/tasks/enable-or-disable.yml b/roles/captiveportal/tasks/enable-or-disable.yml index 504467114..4d289fe86 100644 --- a/roles/captiveportal/tasks/enable-or-disable.yml +++ b/roles/captiveportal/tasks/enable-or-disable.yml @@ -36,6 +36,10 @@ state: absent when: not captiveportal_enabled +- name: Run iiab-divert-to-nginx to generate diversion lists for NGINX + shell: /usr/sbin/iiab-divert-to-nginx + when: captiveportal_enabled | bool + - name: Delete /etc/dnsmasq.d/capture to make sure dnsmasq is not diverting (if not captiveportal_enabled) file: path: /etc/dnsmasq.d/capture diff --git a/roles/captiveportal/tasks/install.yml b/roles/captiveportal/tasks/install.yml index 40c50f146..4db295fdc 100644 --- a/roles/captiveportal/tasks/install.yml +++ b/roles/captiveportal/tasks/install.yml @@ -44,9 +44,6 @@ - simple.template - mac.template -- name: Run iiab-divert-to-nginx to generate diversion lists for NGINX - shell: /usr/sbin/iiab-divert-to-nginx - - name: Run iiab-make-cp-servers.py to generate NGINX servers from /opt/iiab/captiveportal/checkurls input list (creates /etc/nginx/sites-available/capture.conf) command: /usr/sbin/iiab-make-cp-servers.py args: