From b9350d12c071542bd59cb99f7bd1f656e466fd61 Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Thu, 21 Jun 2018 19:42:51 +0000
Subject: [PATCH] fixes for rpi

---
 roles/sugarizer/tasks/main.yml           |  1 +
 roles/sugarizer/templates/sugarizer.conf |  3 +-
 roles/sugarizer/templates/sugarizer.js   | 40 ++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 roles/sugarizer/templates/sugarizer.js

diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml
index 0dbd4d965..84b4311d8 100644
--- a/roles/sugarizer/tasks/main.yml
+++ b/roles/sugarizer/tasks/main.yml
@@ -99,6 +99,7 @@
     - { 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: 'sugarizer.js' , dest: '/opt/iiab/sugarizer-server',mode: '0644' }
 
 - 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 ff1fe7508..e74fb0c9a 100644
--- a/roles/sugarizer/templates/sugarizer.conf
+++ b/roles/sugarizer/templates/sugarizer.conf
@@ -1,2 +1 @@
-RewriteEngine on
-RewriteRule       ^/sugarizer(.*)$  http://localhost:8089$1 [PT]
+ProxyPass /sugarizer http://box.lan:8089
diff --git a/roles/sugarizer/templates/sugarizer.js b/roles/sugarizer/templates/sugarizer.js
new file mode 100644
index 000000000..abd505ea6
--- /dev/null
+++ b/roles/sugarizer/templates/sugarizer.js
@@ -0,0 +1,40 @@
+// require files
+var express = require('express'),
+	http = require('http'),
+	https = require('https'),
+	settings = require('./config/settings'),
+	common = require('./dashboard/helper/common');
+	ini = settings.load(),
+	app = express(),
+	server = null;
+
+// init common
+common.init(ini);
+
+//configure app setting
+require('./config/main')(app, ini);
+
+// include api routes
+require('./api/route')(app, ini);
+
+// include dashboard routes
+require('./dashboard/route')(app, ini);
+
+// Handle https
+if (ini.security.https) {
+	var credentials = common.loadCredentials(ini);
+	if (!credentials) {
+		console.log("Error reading HTTPS credentials");
+		process.exit(-1);
+	}
+	server = https.createServer(credentials, app);
+} else {
+	server = http.createServer(app);
+}
+
+// Start listening
+server.listen(ini.web.port,"0.0.0.0");
+console.log("Sugarizer Server is listening on"+(ini.security.https ? " secure":"")+" port " + ini.web.port + "...");
+
+//export app for testing
+module.exports = app;