From 0e6a4c8ae61d5deeabc88c5535fe8bcc7f93975e Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Tue, 22 May 2018 19:17:48 +0000
Subject: [PATCH] proxy passthrough

---
 roles/sugarizer/tasks/main.yml                 | 1 -
 roles/sugarizer/templates/sugarizer.conf       | 5 ++---
 roles/sugarizer/templates/sugarizer.service.j2 | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml
index 853fc3f8d..dd930fdf5 100644
--- a/roles/sugarizer/tasks/main.yml
+++ b/roles/sugarizer/tasks/main.yml
@@ -95,7 +95,6 @@
     - { src: 'sugarizer.service.j2' , dest: '/etc/systemd/system/sugarizer.service', mode: '0644' }
     - { src: 'sugarizer.ini' , dest: '{{ sugarizer_location }}/{{ sugarizer_server_version }}/env/sugarizer.ini', mode: '0644' }
     - { src: 'sugarizer.conf' , dest: '/etc/apache2/sites-available',mode: '0644' }
-    - { src: 'start-sugarizer.sh' , dest: '{{ sugarizer_location }}/{{ sugarizer_server_version }}/', mode: '0755' }
 
 - name: Create the symlink enabling the rewrite
   file: src=/etc/apache2/sites-available/sugarizer.conf
diff --git a/roles/sugarizer/templates/sugarizer.conf b/roles/sugarizer/templates/sugarizer.conf
index 72dcf33e4..ff1fe7508 100644
--- a/roles/sugarizer/templates/sugarizer.conf
+++ b/roles/sugarizer/templates/sugarizer.conf
@@ -1,3 +1,2 @@
-RewriteRule       ^/sugarizer(.*)$  http://localhost:"{{ sugarizer_port }}/sugarizer$1" [P,L]
-ProxyPassReverse  /sugarizer        http://localhost:"{{ sugarizer_port }}/sugarizer"
-ProxyRequests     Off
+RewriteEngine on
+RewriteRule       ^/sugarizer(.*)$  http://localhost:8089$1 [PT]
diff --git a/roles/sugarizer/templates/sugarizer.service.j2 b/roles/sugarizer/templates/sugarizer.service.j2
index 82a5c1ace..76d238f06 100644
--- a/roles/sugarizer/templates/sugarizer.service.j2
+++ b/roles/sugarizer/templates/sugarizer.service.j2
@@ -5,7 +5,7 @@ Requires=After=mongodb.service       # Requires the mongodb service to run first
 [Service]
 WorkingDirectory=/opt/iiab/sugarizer-server/
 ExecStart=/usr/bin/node /opt/iiab/sugarizer-server/sugarizer.js
-Type=forking
+Type=simple
 Restart=always
 RestartSec=10
 StandardOutput=syslog