From 4e48d2baf22667da697dba39f5759e8e5e4bc700 Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Wed, 18 Dec 2019 16:36:38 +0000
Subject: [PATCH] need capture-wsgi as template to soft code port

---
 roles/captiveportal/tasks/main.yml                       | 4 ++--
 roles/captiveportal/{files => templates}/capture-wsgi.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename roles/captiveportal/{files => templates}/capture-wsgi.py (99%)

diff --git a/roles/captiveportal/tasks/main.yml b/roles/captiveportal/tasks/main.yml
index dd8fa1fbd..77c5f7795 100644
--- a/roles/captiveportal/tasks/main.yml
+++ b/roles/captiveportal/tasks/main.yml
@@ -23,8 +23,8 @@
     - { src: roles/captiveportal/templates/iiab-divert-to-nginx, mode: '0755', dest: /usr/sbin/ }
 
 - name: Put put the python script that creates the server in place
-  copy:
-    src: roles/captiveportal/files/capture-wsgi.py 
+  template:
+    src: roles/captiveportal/templates/capture-wsgi.py 
     mode: '0755' 
     dest: /opt/iiab/captiveportal/ 
 
diff --git a/roles/captiveportal/files/capture-wsgi.py b/roles/captiveportal/templates/capture-wsgi.py
similarity index 99%
rename from roles/captiveportal/files/capture-wsgi.py
rename to roles/captiveportal/templates/capture-wsgi.py
index 7362fc308..17f0a1893 100755
--- a/roles/captiveportal/files/capture-wsgi.py
+++ b/roles/captiveportal/templates/capture-wsgi.py
@@ -51,8 +51,8 @@ logger = logging.getLogger('/var/log/apache2/portal.log')
 handler = RotatingFileHandler("/var/log/apache2/portal.log", maxBytes=100000, backupCount=2)
 logger.addHandler(handler)
 
-#PORT={{ captiveportal_port }}
-PORT=9090
+PORT={{ captiveportal_port }}
+#PORT=9090
 
 
 # Define globals
@@ -394,7 +394,7 @@ def application (environ, start_response):
       data = ['{}: {}\n'.format(key, value) for key, value in sorted(environ.items()) ]
       #logger.debug("need the correct ip:{}".format(data))
       ip = environ['REMOTE_ADDR'].strip()
-   cmd="arp -an {}|gawk \'{{print $4}}\'".format(ip)
+   cmd="arp -an %s|gawk \'{print $4}\'"%(ip)
    mac = subprocess.check_output(cmd, shell=True)
    data = []
    data.append("host: {}\n".format(environ['HTTP_HOST']))