From 5545979fe381ee85e0613f91b1507a96b2e2340b Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Tue, 22 May 2018 16:52:31 +0000
Subject: [PATCH] working on startup

---
 roles/sugarizer/tasks/main.yml                 |  9 +++++----
 roles/sugarizer/templates/start-sugarizer.sh   |  5 -----
 roles/sugarizer/templates/sugarizer.service.j2 | 15 ++++++++-------
 3 files changed, 13 insertions(+), 16 deletions(-)
 delete mode 100755 roles/sugarizer/templates/start-sugarizer.sh

diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml
index 17b5c366b..853fc3f8d 100644
--- a/roles/sugarizer/tasks/main.yml
+++ b/roles/sugarizer/tasks/main.yml
@@ -88,13 +88,14 @@
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
+    mode: "{{ item.mode }}"
     owner: root
     group: root
-    mode: 0644
   with_items:
-    - { src: 'sugarizer.service.j2' , dest: '/etc/systemd/system/sugarizer.service'}
-    - { src: 'sugarizer.ini' , dest: '{{ sugarizer_location }}/{{ sugarizer_server_version }}/env/sugarizer.ini' }
-    - { src: 'sugarizer.conf' , dest: '/etc/apache2/sites-available' }
+    - { 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/start-sugarizer.sh b/roles/sugarizer/templates/start-sugarizer.sh
deleted file mode 100755
index cae4775d3..000000000
--- a/roles/sugarizer/templates/start-sugarizer.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-# shim to daemonize node sugarizer.js, declare log target, return 0
-cd /opt/iiab/sugarizer-server
-nohup /bin/node sugarizer.js >> /var/log/sugarizer.log &
-exit 0
diff --git a/roles/sugarizer/templates/sugarizer.service.j2 b/roles/sugarizer/templates/sugarizer.service.j2
index 6b900ce78..82a5c1ace 100644
--- a/roles/sugarizer/templates/sugarizer.service.j2
+++ b/roles/sugarizer/templates/sugarizer.service.j2
@@ -1,15 +1,16 @@
 [unit]
 Description=Node.js Sugarizer Server
-# Requires=After=mongodb.service       # Requires the mongodb service to run first
+Requires=After=mongodb.service       # Requires the mongodb service to run first
 
 [Service]
-WorkingDirectory={{ sugarizer_location }}/sugarizer-server/
-ExecStart=start-sugarizer.sh
+WorkingDirectory=/opt/iiab/sugarizer-server/
+ExecStart=/usr/bin/node /opt/iiab/sugarizer-server/sugarizer.js
+Type=forking
 Restart=always
-#RestartSec=10                       # Restart service after 10 seconds if node service crashes
-#StandardOutput=syslog               # Output to syslog
-#StandardError=syslog                # Output to syslog
-#SyslogIdentifier=sugarizer
+RestartSec=10
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=sugarizer
 #User=<alternate user>
 #Group=<alternate group>
 #Environment=NODE_ENV=production