diff --git a/Procfile.production b/Procfile.production deleted file mode 100644 index f1126486512..00000000000 --- a/Procfile.production +++ /dev/null @@ -1,2 +0,0 @@ -web: bundle exec rails s -p $PORT -e production -worker: bundle exec rake environment resque:work RAILS_ENV=production QUEUE=* diff --git a/doc/development.md b/doc/development.md index ef6a9b02757..179c708de53 100644 --- a/doc/development.md +++ b/doc/development.md @@ -8,9 +8,9 @@ Install the Gitlab development in a virtual machine with the [Gitlab Vagrant vir ### Start application in development mode -#### 1. Via gitlab cli +#### 1. Via foreman - ./gitlab start + bundle exec foreman start -p 3000 #### 2. Manually diff --git a/gitlab b/gitlab deleted file mode 100755 index acafb3f10c4..00000000000 --- a/gitlab +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/env ruby - -class GitlabCli - def initialize - @path = File.dirname(__FILE__) - @command = ARGV.shift - @mode = ARGV.shift - end - - def execute - case @command - when 'start' then start - when 'stop' then stop - else - puts "-- Usage gitlab start production or gitlab stop development" - end - end - - private - - def start - case @mode - when 'production'; - system(unicorn_start_cmd) - system(resque_start_cmd) - else - system(rails_start_cmd) - system(resque_dev_start_cmd) - end - end - - def stop - case @mode - when 'production'; - system(unicorn_stop_cmd) - else - system(rails_stop_cmd) - end - system(resque_stop_cmd) - end - - def rails_start_cmd - "bundle exec rails s -d" - end - - def rails_stop_cmd - pid = File.join(@path, "tmp/pids/server.pid") - "kill -QUIT `cat #{pid}`" - end - - def unicorn_start_cmd - unicorn_conf = File.join(@path, "config/unicorn.rb") - "bundle exec unicorn_rails -c #{unicorn_conf} -E production -D" - end - - def unicorn_stop_cmd - pid = File.join(@path, "/tmp/pids/unicorn.pid") - "kill -QUIT `cat #{pid}`" - end - - def resque_dev_start_cmd - "./resque_dev.sh > /dev/null 2>&1" - end - - def resque_start_cmd - "./resque.sh > /dev/null 2>&1" - end - - def resque_stop_cmd - pid = File.join(@path, "tmp/pids/resque_worker.pid") - "kill -QUIT `cat #{pid}`" - end -end - -GitlabCli.new.execute