Download as
Browse Code »

Commit fbbd989770ea48d472a5c4d7d95b970542279099

Authored by Dmitriy Zaporozhets
2 parents 10458bc4 28f40b72
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'update/deploy.sh' into 'master' 

change mysql to postgres in some of the docs and scripts

* update deploy.sh, install gem without mysql, now that we want to use postgres instead
* update update_patch.md to assume postgres before mysql
* update ruby.md, to assume postgres
Showing 3 changed files with 6 additions and 6 deletions   Show diff stats
doc/update/patch_versions.md
  Diff comments   View file @fbbd989
... ... @@ -38,12 +38,12 @@ Replace LATEST_TAG with the latest GitLab Shell tag you want to upgrade to, for
38 38 ```bash
39 39 cd /home/git/gitlab
40 40  
41   -# MySQL
42   -sudo -u git -H bundle install --without development test postgres --deployment
43   -
44 41 #PostgreSQL
45 42 sudo -u git -H bundle install --without development test mysql --deployment
46 43  
  44 +# MySQL
  45 +sudo -u git -H bundle install --without development test postgres --deployment
  46 +
47 47 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
48 48 sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production
49 49 sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
... ...
doc/update/ruby.md
  Diff comments   View file @fbbd989
... ... @@ -41,7 +41,7 @@ Just to be sure we will reinstall the gems used by GitLab. Note that the `bundle
41 41 ```bash
42 42 cd /home/git/gitlab
43 43 sudo -u git -H rm -rf vendor/bundle # remove existing Gem bundle
44   -sudo -u git -H bundle install --deployment --without development test postgres aws # Assuming MySQL
  44 +sudo -u git -H bundle install --deployment --without development test mysql aws # Assuming PostgreSQL
45 45 ```
46 46  
47 47 ### 6. Start GitLab
... ...
lib/support/deploy/deploy.sh
  Diff comments   View file @fbbd989
... ... @@ -28,7 +28,7 @@ sudo -u git -H git pull origin master
28 28 echo 'Deploy: Bundle and migrate'
29 29  
30 30 # change it to your needs
31   -sudo -u git -H bundle --without aws development test postgres --deployment
  31 +sudo -u git -H bundle --without aws development test mysql --deployment
32 32  
33 33 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
34 34 sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production
... ... @@ -42,4 +42,4 @@ echo 'Deploy: Starting GitLab server...'
42 42 sudo service gitlab start
43 43  
44 44 sudo -u git -H rm /home/git/gitlab/public/index.html
45   -echo 'Deploy: Done'
46 45 \ No newline at end of file
  46 +echo 'Deploy: Done'
... ...