From 244be9f2d714a2a053a6fccb01e17dfae228d7eb Mon Sep 17 00:00:00 2001
From: rgangela99 <rgangela99@gmail.com>
Date: Sat, 28 Jul 2018 13:31:33 -0400
Subject: [PATCH] Add /lokole/ to path for links from webapp

---
 roles/lokole/defaults/main.yml        |  2 +-
 roles/lokole/templates/lokole.conf.j2 | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/roles/lokole/defaults/main.yml b/roles/lokole/defaults/main.yml
index f69099d63..afb4458b0 100644
--- a/roles/lokole/defaults/main.yml
+++ b/roles/lokole/defaults/main.yml
@@ -12,7 +12,7 @@ lokole_install: True
 lokole_enabled: True
 
 lokole_url: /lokole
-lokole_full_url: "http://{{ iiab_hostname }}.{{ iiab_domain }}/{{ lokole_url }}"
+lokole_full_url: "http://{{ iiab_hostname }}.{{ iiab_domain }}{{ lokole_url }}"
 
 lokole_domain_socket: "{{ lokole_run_directory }}/lokole_gunicorn.sock"
 
diff --git a/roles/lokole/templates/lokole.conf.j2 b/roles/lokole/templates/lokole.conf.j2
index 9ed5b4b23..10f5ff65b 100644
--- a/roles/lokole/templates/lokole.conf.j2
+++ b/roles/lokole/templates/lokole.conf.j2
@@ -1,5 +1,14 @@
 # Root directory goes to Lokole web server
-ProxyPass {{ lokole_url }}  unix:{{ lokole_domain_socket }}|{{ lokole_full_url }}
+
+ProxyRequests off
+ProxyPass {{ lokole_url }}/ unix:{{ lokole_domain_socket }}|http://{{ iiab_hostname }}.{{ iiab_domain }}/
+
+<Location {{ lokole_url }}/>
+  ProxyPassReverse /
+  ProxyHTMLEnable On
+  ProxyHTMLURLMap / {{ lokole_url }}/
+  RequestHeader unset Accept-Encoding
+</Location>
 
 # /static directory is stored on filesystem
 Alias {{ lokole_url }}/static {{ lokole_install_path }}