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
This commit is contained in:
Dmitriy Zaporozhets
2014-03-04 16:39:21 +00:00
3 changed files with 6 additions and 6 deletions
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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'
echo 'Deploy: Done'