Download as
Browse Code »

Commit 0d475208ac99b818d4063f73289390c578302459

Authored by Dmitriy Zaporozhets
2 parents 660585ca c8460c47
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'updater_location' into 'master' 

Updater one liner based on location

Fixes #1303
Showing 1 changed file with 6 additions and 3 deletions   Show diff stats
doc/update/upgrader.md
  Diff comments   View file @0d47520
@@ -18,11 +18,12 @@ __GitLab Upgrader is available only for GitLab version 6.4.2 or higher__ @@ -18,11 +18,12 @@ __GitLab Upgrader is available only for GitLab version 6.4.2 or higher__
18 18
19 ### 2. Run gitlab upgrade tool 19 ### 2. Run gitlab upgrade tool
20 20
  21 + # Starting with GitLab version 7.0 upgrader script has been moved to bin directory
21 cd /home/git/gitlab 22 cd /home/git/gitlab
22 - sudo -u git -H ruby bin/upgrade.rb 23 + if [ -f bin/upgrade.rb ]; then sudo -u git -H ruby bin/upgrade.rb; else sudo -u git -H ruby script/upgrade.rb; fi
23 24
24 # to perform a non-interactive install (no user input required) you can add -y 25 # to perform a non-interactive install (no user input required) you can add -y
25 - # sudo -u git -H ruby bin/upgrade.rb -y 26 + # if [ -f bin/upgrade.rb ]; then sudo -u git -H ruby bin/upgrade.rb -y; else sudo -u git -H ruby script/upgrade.rb -y; fi
26 27
27 ### 3. Start application 28 ### 3. Start application
28 29
@@ -55,6 +56,8 @@ Here is a one line command with step 1 to 4 for the next time you upgrade: @@ -55,6 +56,8 @@ Here is a one line command with step 1 to 4 for the next time you upgrade:
55 56
56 ```bash 57 ```bash
57 cd /home/git/gitlab; sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production; \ 58 cd /home/git/gitlab; sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production; \
58 - sudo service gitlab stop; sudo -u git -H ruby bin/upgrade.rb -y; sudo service gitlab start; \ 59 + sudo service gitlab stop; \
  60 + if [ -f bin/upgrade.rb ]; then sudo -u git -H ruby bin/upgrade.rb -y; else sudo -u git -H ruby script/upgrade.rb -y; fi; \
  61 + sudo service gitlab start; \
59 sudo service nginx restart; sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production 62 sudo service nginx restart; sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
60 ``` 63 ```