summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2014-05-27 17:14:41 +0200
committerMarin Jankovski <marin@gitlab.com>2014-05-27 17:14:41 +0200
commit2341cefd6fa2811a1af41f2068554738d7eebfc4 (patch)
tree807a376257151323a203c39dd2ff08b23e29a21e /lib
parentcb4b504b26a269ba6ebb3fee165296a80d962c69 (diff)
downloadgitlab-ce-2341cefd6fa2811a1af41f2068554738d7eebfc4.tar.gz
Move from script to bin directory.
Diffstat (limited to 'lib')
-rwxr-xr-xlib/support/init.d/gitlab12
-rw-r--r--lib/tasks/gitlab/check.rake2
-rw-r--r--lib/tasks/sidekiq.rake8
3 files changed, 11 insertions, 11 deletions
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
index 3dd4465a6d8..5c1ce2dadab 100755
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
@@ -167,14 +167,14 @@ start_gitlab() {
# 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 bin/web start
fi
# If sidekiq is already running, don't start it again.
if [ "$sidekiq_status" = "0" ]; then
echo "The Sidekiq job dispatcher is already running with pid $spid, not restarting"
else
- RAILS_ENV=$RAILS_ENV script/background_jobs start &
+ RAILS_ENV=$RAILS_ENV bin/background_jobs start &
fi
# Wait for the pids to be planted
@@ -197,11 +197,11 @@ stop_gitlab() {
# If the Unicorn web server is running, tell it to stop;
if [ "$web_status" = "0" ]; then
- RAILS_ENV=$RAILS_ENV script/web stop
+ RAILS_ENV=$RAILS_ENV bin/web stop
fi
# And do the same thing for the Sidekiq.
if [ "$sidekiq_status" = "0" ]; then
- RAILS_ENV=$RAILS_ENV script/background_jobs stop
+ RAILS_ENV=$RAILS_ENV bin/background_jobs stop
fi
# If something needs to be stopped, lets wait for it to stop. Never use SIGKILL in a script.
@@ -253,10 +253,10 @@ reload_gitlab(){
exit 1
fi
printf "Reloading GitLab Unicorn configuration... "
- RAILS_ENV=$RAILS_ENV script/web reload
+ RAILS_ENV=$RAILS_ENV bin/web reload
echo "Done."
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
print_status
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 0387795fa48..ad5e04ecab9 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -637,7 +637,7 @@ namespace :gitlab do
else
puts "no".red
try_fixing_it(
- sudo_gitlab("RAILS_ENV=production script/background_jobs start")
+ sudo_gitlab("RAILS_ENV=production bin/background_jobs start")
)
for_more_information(
see_installation_guide_section("Install Init Script"),
diff --git a/lib/tasks/sidekiq.rake b/lib/tasks/sidekiq.rake
index ba806e53ccf..e4bd6545755 100644
--- a/lib/tasks/sidekiq.rake
+++ b/lib/tasks/sidekiq.rake
@@ -1,21 +1,21 @@
namespace :sidekiq do
desc "GITLAB | Stop sidekiq"
task :stop do
- system *%W(script/background_jobs stop)
+ system *%W(bin/background_jobs stop)
end
desc "GITLAB | Start sidekiq"
task :start do
- system *%W(script/background_jobs start)
+ system *%W(bin/background_jobs start)
end
desc 'GitLab | Restart sidekiq'
task :restart do
- system *%W(script/background_jobs restart)
+ system *%W(bin/background_jobs restart)
end
desc "GITLAB | Start sidekiq with launchd on Mac OS X"
task :launchd do
- system *%W(script/background_jobs start_no_deamonize)
+ system *%W(bin/background_jobs start_no_deamonize)
end
end