From 103954cb9694f3ebcd10b0ee5768417112687ef5 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 18:18:15 +0000
Subject: [PATCH] * VRFS-1074 - create run folders for pids on every upstart
 start

---
 admin/script/package/jam-admin.conf                     | 6 ++++++
 admin/script/package/post-install.sh                    | 2 --
 web/script/package/jam-web.conf                         | 6 ++++++
 web/script/package/post-install.sh                      | 2 --
 websocket-gateway/script/package/post-install.sh        | 2 --
 websocket-gateway/script/package/websocket-gateway.conf | 6 ++++++
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/admin/script/package/jam-admin.conf b/admin/script/package/jam-admin.conf
index 43e8a34cc..c429d3209 100644
--- a/admin/script/package/jam-admin.conf
+++ b/admin/script/package/jam-admin.conf
@@ -6,4 +6,10 @@ stop on runlevel [016]
 setuid jam-admin
 setgid jam-admin
 
+pre-start script
+    set -e
+    mkdir -p /var/run/jam-admin
+    chown jam-admin:jam-admin /var/run/jam-admin
+end script
+
 exec start-stop-daemon --start --chdir /var/lib/jam-admin --exec /var/lib/jam-admin/script/package/upstart-run.sh 
diff --git a/admin/script/package/post-install.sh b/admin/script/package/post-install.sh
index 9949dce43..1ed894877 100755
--- a/admin/script/package/post-install.sh
+++ b/admin/script/package/post-install.sh
@@ -14,9 +14,7 @@ mkdir -p /var/lib/$NAME/log
 mkdir -p /var/lib/$NAME/tmp
 mkdir -p /etc/$NAME
 mkdir -p /var/log/$NAME
-mkdir -p /var/run/$NAME
 
 chown -R $USER:$GROUP /var/lib/$NAME
 chown -R $USER:$GROUP /etc/$NAME
 chown -R $USER:$GROUP /var/log/$NAME
-chown -R $USER:$GROUP /var/run/$NAME
diff --git a/web/script/package/jam-web.conf b/web/script/package/jam-web.conf
index b2a864627..b85686a76 100755
--- a/web/script/package/jam-web.conf
+++ b/web/script/package/jam-web.conf
@@ -6,4 +6,10 @@ stop on runlevel [016]
 setuid jam-web
 setgid jam-web
 
+pre-start script
+    set -e
+    mkdir -p /var/run/jam-web
+    chown jam-web:jam-web /var/run/jam-web
+end script
+
 exec start-stop-daemon --start --chdir /var/lib/jam-web --exec /var/lib/jam-web/script/package/upstart-run.sh 
diff --git a/web/script/package/post-install.sh b/web/script/package/post-install.sh
index aa3d87230..c6534c54f 100755
--- a/web/script/package/post-install.sh
+++ b/web/script/package/post-install.sh
@@ -14,12 +14,10 @@ mkdir -p /var/lib/$NAME/log
 mkdir -p /var/lib/$NAME/tmp
 mkdir -p /etc/$NAME
 mkdir -p /var/log/$NAME
-mkdir -p /var/run/$NAME
 
 chown -R $USER:$GROUP /var/lib/$NAME
 chown -R $USER:$GROUP /etc/$NAME
 chown -R $USER:$GROUP /var/log/$NAME
-chown -R $USER:$GROUP /var/run/$NAME
 
 # make log folders for jobs
 mkdir -p /var/log/any-job-worker
diff --git a/websocket-gateway/script/package/post-install.sh b/websocket-gateway/script/package/post-install.sh
index c32d60e32..fb09f8d7f 100755
--- a/websocket-gateway/script/package/post-install.sh
+++ b/websocket-gateway/script/package/post-install.sh
@@ -11,7 +11,5 @@ GROUP="$NAME"
 cp /var/lib/$NAME/script/package/$NAME.conf /etc/init/$NAME.conf
 
 mkdir -p /var/lib/$NAME/log
-mkdir -p /var/run/$NAME
 
 chown -R $USER:$GROUP /var/lib/$NAME
-chown -R $USER:$GROUP /var/run/$NAME
diff --git a/websocket-gateway/script/package/websocket-gateway.conf b/websocket-gateway/script/package/websocket-gateway.conf
index af10f4e62..9328c3e9f 100755
--- a/websocket-gateway/script/package/websocket-gateway.conf
+++ b/websocket-gateway/script/package/websocket-gateway.conf
@@ -6,4 +6,10 @@ stop on runlevel [016]
 setuid websocket-gateway
 setgid websocket-gateway
 
+pre-start script
+    set -e
+    mkdir -p /var/run/websocket-gateway
+    chown websocket-gateway:websocket-gateway /var/run/websocket-gateway
+end script
+
 exec start-stop-daemon --start --chdir /var/lib/websocket-gateway --exec /var/lib/websocket-gateway/script/package/upstart-run.sh