From 620e8bc1afae93e2bdc20b091e7bdd47ecbb45bd Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@forwardbias.in>
Date: Fri, 21 Nov 2014 23:18:11 -0800
Subject: [PATCH] Move supervisor scripts into postinstall

---
 run.sh                                                        | 4 +---
 .../postinstall/{setup_supervisor.sh => setup_supervisord.sh} | 3 +--
 .../scripts/postinstall/supervisord}/supervisord.conf         | 0
 supervisor/conf.d/nginx.conf                                  | 4 ----
 4 files changed, 2 insertions(+), 9 deletions(-)
 rename src/scripts/postinstall/{setup_supervisor.sh => setup_supervisord.sh} (95%)
 rename {supervisor => src/scripts/postinstall/supervisord}/supervisord.conf (100%)
 delete mode 100644 supervisor/conf.d/nginx.conf

diff --git a/run.sh b/run.sh
index 70862063f..d4266facc 100755
--- a/run.sh
+++ b/run.sh
@@ -22,7 +22,5 @@ cp nginx/cert/* $NGINX_ROOT/cert/
 touch $NGINX_ROOT/naked_domain.conf
 sed -e "s/##ADMIN_FQDN##/admin-localhost/" -e "s|##SRCDIR##|$SRCDIR|" nginx/admin.conf_template > $NGINX_ROOT/applications/admin.conf
 
-
-sudo mkdir -p /var/log/supervisor
-sudo NGINX_ROOT=$NGINX_ROOT supervisord -n -c supervisor/supervisord.conf
+sudo nginx -c nginx.conf -p $NGINX_ROOT
 
diff --git a/src/scripts/postinstall/setup_supervisor.sh b/src/scripts/postinstall/setup_supervisord.sh
similarity index 95%
rename from src/scripts/postinstall/setup_supervisor.sh
rename to src/scripts/postinstall/setup_supervisord.sh
index b17efa047..7473c019f 100755
--- a/src/scripts/postinstall/setup_supervisor.sh
+++ b/src/scripts/postinstall/setup_supervisord.sh
@@ -10,9 +10,8 @@ NGINX_CONFIG_DIR=/home/$USER/configs/nginx
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 rm -rf /etc/supervisor
-mkdir -p /etc/supervisor
 mkdir -p /etc/supervisor/conf.d
-cp $SRCDIR/supervisor/supervisord.conf /etc/supervisor/
+cp $SCRIPT_DIR/supervisord/supervisord.conf /etc/supervisor/
 
 echo "Writing supervisor configs..."
 
diff --git a/supervisor/supervisord.conf b/src/scripts/postinstall/supervisord/supervisord.conf
similarity index 100%
rename from supervisor/supervisord.conf
rename to src/scripts/postinstall/supervisord/supervisord.conf
diff --git a/supervisor/conf.d/nginx.conf b/supervisor/conf.d/nginx.conf
deleted file mode 100644
index b3737fd43..000000000
--- a/supervisor/conf.d/nginx.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[program:nginx]
-command=nginx -c nginx.conf -p %(ENV_NGINX_ROOT)s/
-autostart=true
-autorestart=true
\ No newline at end of file