diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-24 20:55:38 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-24 20:55:38 +0200 |
| commit | 503eb80c8d2f2b8d0e1f6be55d907f743f9aaf34 (patch) | |
| tree | 735a7934a9ff6a38be997f8944d3c834d239a75f | |
| parent | bd420df9d4a5c57bfd362314c7a315e3cf5d3d42 (diff) | |
| parent | 245b203b463c35504a7023246a9e45dbe3c8023a (diff) | |
| download | gitlab-ci-503eb80c8d2f2b8d0e1f6be55d907f743f9aaf34.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlab-ci
| -rw-r--r-- | doc/update/4.2-to-4.3.md | 2 | ||||
| -rwxr-xr-x | lib/support/init.d/gitlab_ci | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/doc/update/4.2-to-4.3.md b/doc/update/4.2-to-4.3.md index b21daff..f340cb6 100644 --- a/doc/update/4.2-to-4.3.md +++ b/doc/update/4.2-to-4.3.md @@ -44,7 +44,7 @@ bundle exec rake db:migrate RAILS_ENV=production ### 5. Setup unicorn ``` -cd config/unicorn.rb.example config/unicorn.rb +cp config/unicorn.rb.example config/unicorn.rb ``` ### 6. Install the new init script diff --git a/lib/support/init.d/gitlab_ci b/lib/support/init.d/gitlab_ci index 7a959e2..a8893ae 100755 --- a/lib/support/init.d/gitlab_ci +++ b/lib/support/init.d/gitlab_ci @@ -161,7 +161,7 @@ start() { # Then check if the service is running. If it is: don't start again. if [ "$web_status" = "0" ]; then - echo "The Unicorn web server already running with pid $wpid, not restarting." + echo "The GitLab CI Unicorn web server already running with pid $wpid, not restarting." else # Remove old socket if it exists rm -f "$socket_path"/gitlab_ci.socket 2>/dev/null @@ -171,7 +171,7 @@ start() { # 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" + echo "The GitLab CI Sidekiq job dispatcher is already running with pid $spid, not restarting" else RAILS_ENV=$RAILS_ENV script/background_jobs start & fi @@ -187,11 +187,11 @@ stop() { exit_if_not_running if [ "$web_status" = "0" -a "$sidekiq_status" = "0" ]; then - echo -n "Shutting down both Unicorn and Sidekiq" + echo -n "Shutting down both GitLab CI Unicorn and Sidekiq" elif [ "$web_status" = "0" ]; then - echo -n "Shutting down Sidekiq" + echo -n "Shutting down GitLab CI Sidekiq" elif [ "$sidekiq_status" = "0" ]; then - echo -n "Shutting down Unicorn" + echo -n "Shutting down GitLab CI Unicorn" fi # If the Unicorn web server is running, tell it to stop; @@ -226,21 +226,21 @@ stop() { print_status() { check_status if [ "$web_status" != "0" -a "$sidekiq_status" != "0" ]; then - echo "GitLab is not running." + echo "GitLab CI is not running." return fi if [ "$web_status" = "0" ]; then - echo "The GitLab Unicorn web server with pid $wpid is running." + echo "The GitLab CI Unicorn web server with pid $wpid is running." else - printf "The GitLab Unicorn web server is \033[31mnot running\033[0m.\n" + printf "The GitLab CI Unicorn web server is \033[31mnot running\033[0m.\n" fi if [ "$sidekiq_status" = "0" ]; then - echo "The GitLab Sidekiq job dispatcher with pid $spid is running." + echo "The GitLab CI Sidekiq job dispatcher with pid $spid is running." else - printf "The GitLab Sidekiq job dispatcher is \033[31mnot running\033[0m.\n" + printf "The GitLab CI Sidekiq job dispatcher is \033[31mnot running\033[0m.\n" fi if [ "$web_status" = "0" -a "$sidekiq_status" = "0" ]; then - printf "GitLab and all its components are \033[32mup and running\033[0m.\n" + printf "GitLab CI and all its components are \033[32mup and running\033[0m.\n" fi } |