From 73a987ea6bedd569e24f37d323883a7dbeb3ae56 Mon Sep 17 00:00:00 2001
From: Nick Downs <nickryand@gmail.com>
Date: Fri, 31 Jan 2014 21:14:05 -0800
Subject: Removed the backgrounding of the unicorn_rails webapp start call.

---
 lib/support/init.d/gitlab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
index ff584e69058..701db3e7d52 100755
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
@@ -167,7 +167,7 @@ start() {
     # Remove old socket if it exists
     rm -f "$socket_path"/gitlab.socket 2>/dev/null
     # Start the web server
-    RAILS_ENV=$RAILS_ENV script/web start &
+    RAILS_ENV=$RAILS_ENV script/web start
   fi
 
   # If sidekiq is already running, don't start it again.
-- 
cgit v1.2.1


From 9422b451eb622196036ec3429bb61ac9a7078c2a Mon Sep 17 00:00:00 2001
From: Pawel Krzaczkowski <pawel@freshmind.pl>
Date: Thu, 19 Dec 2013 10:52:29 +0100
Subject: Init script - change start() stop() restart() reload() to
 xxxx_gitlab()

---
 lib/support/init.d/gitlab | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
index ff584e69058..0308181b86b 100755
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
@@ -149,7 +149,7 @@ exit_if_not_running(){
 }
 
 ## Starts Unicorn and Sidekiq if they're not running.
-start() {
+start_gitlab() {
   check_stale_pids
 
   if [ "$web_status" != "0" -a "$sidekiq_status" != "0" ]; then
@@ -184,7 +184,7 @@ start() {
 }
 
 ## Asks the Unicorn and the Sidekiq if they would be so kind as to stop, if not kills them.
-stop() {
+stop_gitlab() {
   exit_if_not_running
 
   if [ "$web_status" = "0" -a "$sidekiq_status" = "0" ]; then
@@ -246,7 +246,7 @@ print_status() {
 }
 
 ## Tells unicorn to reload it's config and Sidekiq to restart
-reload(){
+reload_gitlab(){
   exit_if_not_running
   if [ "$wpid" = "0" ];then
     echo "The GitLab Unicorn Web server is not running thus its configuration can't be reloaded."
@@ -263,12 +263,12 @@ reload(){
 }
 
 ## Restarts Sidekiq and Unicorn.
-restart(){
+restart_gitlab(){
   check_status
   if [ "$web_status" = "0" -o "$sidekiq_status" = "0" ]; then
-    stop
+    stop_gitlab
   fi
-  start
+  start_gitlab
 }
 
 
@@ -276,16 +276,16 @@ restart(){
 
 case "$1" in
   start)
-        start
+        start_gitlab
         ;;
   stop)
-        stop
+        stop_gitlab
         ;;
   restart)
-        restart
+        restart_gitlab
         ;;
   reload|force-reload)
-	reload
+	reload_gitlab
         ;;
   status)
         print_status
-- 
cgit v1.2.1