diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-04 16:39:21 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-04 16:39:21 +0000 |
| commit | fbbd989770ea48d472a5c4d7d95b970542279099 (patch) | |
| tree | 1737cf3ccf6601daea344febf827c1ecda3c0972 | |
| parent | 10458bc47898e975b588762d15f8207cc896548d (diff) | |
| parent | 28f40b72053fdc684c975ea32c11820b47b75e52 (diff) | |
| download | gitlab-ce-fbbd989770ea48d472a5c4d7d95b970542279099.tar.gz | |
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
| -rw-r--r-- | doc/update/patch_versions.md | 6 | ||||
| -rw-r--r-- | doc/update/ruby.md | 2 | ||||
| -rwxr-xr-x | lib/support/deploy/deploy.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md index b284ff48365..21b93c0b929 100644 --- a/doc/update/patch_versions.md +++ b/doc/update/patch_versions.md @@ -38,12 +38,12 @@ Replace LATEST_TAG with the latest GitLab Shell tag you want to upgrade to, for ```bash cd /home/git/gitlab -# MySQL -sudo -u git -H bundle install --without development test postgres --deployment - #PostgreSQL sudo -u git -H bundle install --without development test mysql --deployment +# MySQL +sudo -u git -H bundle install --without development test postgres --deployment + sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production diff --git a/doc/update/ruby.md b/doc/update/ruby.md index 3fc068c0ae2..9d0cafb3f05 100644 --- a/doc/update/ruby.md +++ b/doc/update/ruby.md @@ -41,7 +41,7 @@ Just to be sure we will reinstall the gems used by GitLab. Note that the `bundle ```bash cd /home/git/gitlab sudo -u git -H rm -rf vendor/bundle # remove existing Gem bundle -sudo -u git -H bundle install --deployment --without development test postgres aws # Assuming MySQL +sudo -u git -H bundle install --deployment --without development test mysql aws # Assuming PostgreSQL ``` ### 6. Start GitLab diff --git a/lib/support/deploy/deploy.sh b/lib/support/deploy/deploy.sh index b96f73058b6..4684957233a 100755 --- a/lib/support/deploy/deploy.sh +++ b/lib/support/deploy/deploy.sh @@ -28,7 +28,7 @@ sudo -u git -H git pull origin master echo 'Deploy: Bundle and migrate' # change it to your needs -sudo -u git -H bundle --without aws development test postgres --deployment +sudo -u git -H bundle --without aws development test mysql --deployment sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production @@ -42,4 +42,4 @@ echo 'Deploy: Starting GitLab server...' sudo service gitlab start sudo -u git -H rm /home/git/gitlab/public/index.html -echo 'Deploy: Done'
\ No newline at end of file +echo 'Deploy: Done' |