Commit 3682e726 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'move_script_to_bin' into 'master'

Move script to bin

Fixes #925
parents d25bc257 2341cefd
...@@ -108,7 +108,7 @@ Start it with [Foreman](https://github.com/ddollar/foreman) ...@@ -108,7 +108,7 @@ Start it with [Foreman](https://github.com/ddollar/foreman)
or start each component separately or start each component separately
bundle exec rails s bundle exec rails s
script/background_jobs start bin/background_jobs start
And surf to [localhost:3000](http://localhost:3000/) and login with root / 5iveL!fe And surf to [localhost:3000](http://localhost:3000/) and login with root / 5iveL!fe
......
...@@ -19,10 +19,10 @@ __GitLab Upgrader is available only for GitLab version 6.4.2 or higher__ ...@@ -19,10 +19,10 @@ __GitLab Upgrader is available only for GitLab version 6.4.2 or higher__
### 2. Run gitlab upgrade tool ### 2. Run gitlab upgrade tool
cd /home/git/gitlab cd /home/git/gitlab
sudo -u git -H ruby script/upgrade.rb sudo -u git -H ruby bin/upgrade.rb
# to perform a non-interactive install (no user input required) you can add -y # to perform a non-interactive install (no user input required) you can add -y
# sudo -u git -H ruby script/upgrade.rb -y # sudo -u git -H ruby bin/upgrade.rb -y
### 3. Start application ### 3. Start application
...@@ -57,6 +57,6 @@ You've read through the entire guide, and probably did all the steps manually. H ...@@ -57,6 +57,6 @@ You've read through the entire guide, and probably did all the steps manually. H
```bash ```bash
cd /home/git/gitlab; sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production; \ cd /home/git/gitlab; sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production; \
sudo service gitlab stop; sudo -u git -H ruby script/upgrade.rb -y; sudo service gitlab start; \ sudo service gitlab stop; sudo -u git -H ruby bin/upgrade.rb -y; sudo service gitlab start; \
sudo service nginx restart; sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production sudo service nginx restart; sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
``` ```
...@@ -167,14 +167,14 @@ start_gitlab() { ...@@ -167,14 +167,14 @@ start_gitlab() {
# Remove old socket if it exists # Remove old socket if it exists
rm -f "$socket_path"/gitlab.socket 2>/dev/null rm -f "$socket_path"/gitlab.socket 2>/dev/null
# Start the web server # Start the web server
RAILS_ENV=$RAILS_ENV script/web start RAILS_ENV=$RAILS_ENV bin/web start
fi fi
# If sidekiq is already running, don't start it again. # If sidekiq is already running, don't start it again.
if [ "$sidekiq_status" = "0" ]; then if [ "$sidekiq_status" = "0" ]; then
echo "The Sidekiq job dispatcher is already running with pid $spid, not restarting" echo "The Sidekiq job dispatcher is already running with pid $spid, not restarting"
else else
RAILS_ENV=$RAILS_ENV script/background_jobs start & RAILS_ENV=$RAILS_ENV bin/background_jobs start &
fi fi
# Wait for the pids to be planted # Wait for the pids to be planted
...@@ -197,11 +197,11 @@ stop_gitlab() { ...@@ -197,11 +197,11 @@ stop_gitlab() {
# If the Unicorn web server is running, tell it to stop; # If the Unicorn web server is running, tell it to stop;
if [ "$web_status" = "0" ]; then if [ "$web_status" = "0" ]; then
RAILS_ENV=$RAILS_ENV script/web stop RAILS_ENV=$RAILS_ENV bin/web stop
fi fi
# And do the same thing for the Sidekiq. # And do the same thing for the Sidekiq.
if [ "$sidekiq_status" = "0" ]; then if [ "$sidekiq_status" = "0" ]; then
RAILS_ENV=$RAILS_ENV script/background_jobs stop RAILS_ENV=$RAILS_ENV bin/background_jobs stop
fi fi
# If something needs to be stopped, lets wait for it to stop. Never use SIGKILL in a script. # If something needs to be stopped, lets wait for it to stop. Never use SIGKILL in a script.
...@@ -253,10 +253,10 @@ reload_gitlab(){ ...@@ -253,10 +253,10 @@ reload_gitlab(){
exit 1 exit 1
fi fi
printf "Reloading GitLab Unicorn configuration... " printf "Reloading GitLab Unicorn configuration... "
RAILS_ENV=$RAILS_ENV script/web reload RAILS_ENV=$RAILS_ENV bin/web reload
echo "Done." echo "Done."
echo "Restarting GitLab Sidekiq since it isn't capable of reloading its config..." echo "Restarting GitLab Sidekiq since it isn't capable of reloading its config..."
RAILS_ENV=$RAILS_ENV script/background_jobs restart RAILS_ENV=$RAILS_ENV bin/background_jobs restart
wait_for_pids wait_for_pids
print_status print_status
......
...@@ -637,7 +637,7 @@ namespace :gitlab do ...@@ -637,7 +637,7 @@ namespace :gitlab do
else else
puts "no".red puts "no".red
try_fixing_it( try_fixing_it(
sudo_gitlab("RAILS_ENV=production script/background_jobs start") sudo_gitlab("RAILS_ENV=production bin/background_jobs start")
) )
for_more_information( for_more_information(
see_installation_guide_section("Install Init Script"), see_installation_guide_section("Install Init Script"),
......
namespace :sidekiq do namespace :sidekiq do
desc "GITLAB | Stop sidekiq" desc "GITLAB | Stop sidekiq"
task :stop do task :stop do
system *%W(script/background_jobs stop) system *%W(bin/background_jobs stop)
end end
desc "GITLAB | Start sidekiq" desc "GITLAB | Start sidekiq"
task :start do task :start do
system *%W(script/background_jobs start) system *%W(bin/background_jobs start)
end end
desc 'GitLab | Restart sidekiq' desc 'GitLab | Restart sidekiq'
task :restart do task :restart do
system *%W(script/background_jobs restart) system *%W(bin/background_jobs restart)
end end
desc "GITLAB | Start sidekiq with launchd on Mac OS X" desc "GITLAB | Start sidekiq with launchd on Mac OS X"
task :launchd do task :launchd do
system *%W(script/background_jobs start_no_deamonize) system *%W(bin/background_jobs start_no_deamonize)
end end
end end
#!/usr/bin/env ruby
# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
APP_PATH = File.expand_path('../../config/application', __FILE__)
require File.expand_path('../../config/boot', __FILE__)
require 'rails/commands'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment