From 4932263fd4d6da15eabcf99bd48f50de5e3cd5f3 Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Thu, 19 Dec 2019 14:32:18 +0000
Subject: [PATCH] jvonau suggested changes

---
 roles/captiveportal/tasks/main.yml                 | 11 +++++++++--
 roles/captiveportal/templates/captiveportal.ini    | 12 ------------
 roles/captiveportal/templates/captiveportal.ini.j2 | 10 ++++++++++
 3 files changed, 19 insertions(+), 14 deletions(-)
 delete mode 100644 roles/captiveportal/templates/captiveportal.ini
 create mode 100644 roles/captiveportal/templates/captiveportal.ini.j2

diff --git a/roles/captiveportal/tasks/main.yml b/roles/captiveportal/tasks/main.yml
index 9a3102b1c..30c84f477 100644
--- a/roles/captiveportal/tasks/main.yml
+++ b/roles/captiveportal/tasks/main.yml
@@ -38,8 +38,8 @@
 
 - name: Copy uWSGI config file
   template:
-    src: roles/captiveportal/templates/captiveportal.ini
-    dest: /opt/iiab/captiveportal/
+    src: roles/captiveportal/templates/captiveportal.ini.j2
+    dest: /opt/iiab/captiveportal/captiveportal.ini
 
 - name: Copy unit file for uWSGI service
   template:
@@ -75,6 +75,13 @@
     state: link
   when: captiveportal_enabled | bool
 
+- name: Disable nginx to location definitions for checkurls
+  file:
+    src: /etc/nginx/sites-available/capture.conf
+    path: /etc/nginx/sites-enabled/capture.conf
+    state: absent
+  when: not captiveportal_enabled | bool
+
 - name: Make sure dnsmasq is not diverting if not captiveportal_enabled
   file:
     path: /etc/dnsmasq.d/capture
diff --git a/roles/captiveportal/templates/captiveportal.ini b/roles/captiveportal/templates/captiveportal.ini
deleted file mode 100644
index 4352b6bdf..000000000
--- a/roles/captiveportal/templates/captiveportal.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[uwsgi]
-   uid = www-data
-   gid = www-data
-   http-socket = :9090
-   chdir = /opt/iiab/captiveportal
-   wsgi-file = capture-wsgi.py
-   #wsgi-file = very_simple.py
-   master = true
-   plugins = python3
-   log-to = /var/log/uwsgi/app/captiveportal.log
-   #die-on-term = true
-   py-autoreload = 2
diff --git a/roles/captiveportal/templates/captiveportal.ini.j2 b/roles/captiveportal/templates/captiveportal.ini.j2
new file mode 100644
index 000000000..7ab40d0cb
--- /dev/null
+++ b/roles/captiveportal/templates/captiveportal.ini.j2
@@ -0,0 +1,10 @@
+[uwsgi]
+   uid = {{ apache_user }}
+   gid = {{ apache_user }}
+   http-socket = {{ captiveportal_port }}
+   chdir = /opt/iiab/captiveportal
+   wsgi-file = capture-wsgi.py
+   master = true
+   plugins = python3
+   log-to = /var/log/apache2/captiveportal.log
+   py-autoreload = 2