From bc4332bd61cf50eb699ff9e62678864d5e0131cf Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Wed, 5 Mar 2014 09:51:35 +0530
Subject: [PATCH] install: moved redis-server supervisor configuration to
 install script

---
 resources/gitlab        | 14 +-------------
 resources/setup/install | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/resources/gitlab b/resources/gitlab
index 838b4952..65747638 100755
--- a/resources/gitlab
+++ b/resources/gitlab
@@ -112,19 +112,7 @@ if [ "${DB_HOST}" == "localhost" ]; then
 fi
 
 if [ "${REDIS_HOST}" == "localhost" ]; then
-	sed 's/daemonize yes/daemonize no/' -i /etc/redis/redis.conf
-	cat > /etc/supervisor/conf.d/redis-server.conf <<EOF
-[program:redis-server]
-priority=20
-directory=/tmp
-command=/usr/bin/redis-server /etc/redis/redis.conf
-user=redis
-autostart=true
-autorestart=true
-stdout_logfile=/var/log/supervisor/%(program_name)s.log
-stderr_logfile=/var/log/supervisor/%(program_name)s.log
-EOF
-	supervisorctl update
+	supervisorctl start redis-server
 fi
 
 # configure git for the 'git' user
diff --git a/resources/setup/install b/resources/setup/install
index b840f32b..6676510a 100755
--- a/resources/setup/install
+++ b/resources/setup/install
@@ -141,3 +141,17 @@ autorestart=true
 stdout_logfile=/var/log/supervisor/%(program_name)s.log
 stderr_logfile=/var/log/supervisor/%(program_name)s.log
 EOF
+
+# configure supervisord to start redis (manual)
+sed 's/daemonize yes/daemonize no/' -i /etc/redis/redis.conf
+cat > /etc/supervisor/conf.d/redis-server.conf <<EOF
+[program:redis-server]
+priority=20
+directory=/tmp
+command=/usr/bin/redis-server /etc/redis/redis.conf
+user=redis
+autostart=false
+autorestart=true
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+EOF