From 00b576e67dee85547feed3ec7679496c085bd8df Mon Sep 17 00:00:00 2001 From: Job van der Voort Date: Thu, 17 Apr 2014 09:42:08 +0200 Subject: [PATCH 1/4] update version in installation doc --- doc/install/installation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index e2b37b0788a..2ccb2d2c706 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -173,13 +173,13 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da ## Clone the Source # Clone GitLab repository - sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 6-7-stable gitlab + sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 6-8-stable gitlab # Go to gitlab dir cd /home/git/gitlab **Note:** -You can change `6-7-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! +You can change `6-8-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! ## Configure it From e6b668ab0169f981a5c4162cd8625daf02e6f5a8 Mon Sep 17 00:00:00 2001 From: Job van der Voort Date: Thu, 17 Apr 2014 09:42:33 +0200 Subject: [PATCH 2/4] update VERSION to 6.8.0.rc1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 38f2fa89925..5a92de67b0c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.8.0.pre +6.8.0.rc1 From c2ad30638a7c9fa307fe1f3a6653a8010fde1f64 Mon Sep 17 00:00:00 2001 From: Job van der Voort Date: Thu, 17 Apr 2014 10:15:50 +0200 Subject: [PATCH 3/4] add 67-68 update guide --- doc/update/6.7-to-6.8.md | 129 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 doc/update/6.7-to-6.8.md diff --git a/doc/update/6.7-to-6.8.md b/doc/update/6.7-to-6.8.md new file mode 100644 index 00000000000..2bf04d3967b --- /dev/null +++ b/doc/update/6.7-to-6.8.md @@ -0,0 +1,129 @@ +# From 6.6 to 6.7 + +### 0. Backup + +```bash +cd /home/git/gitlab +sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production +``` + +### 1. Stop server + + sudo service gitlab stop + +### 2. Get latest code + +```bash +cd /home/git/gitlab +sudo -u git -H git fetch --all +``` + +For Gitlab Community Edition: + +```bash +sudo -u git -H git checkout 6-7-stable +``` + +OR + +For GitLab Enterprise Edition: + +```bash +sudo -u git -H git checkout 6-7-stable-ee +``` + +### 3. Update gitlab-shell (and its config) + +```bash +cd /home/git/gitlab-shell +sudo -u git -H git fetch +sudo -u git -H git checkout v1.9.1 +``` + +### 4. Install libs, migrations, etc. + +```bash +cd /home/git/gitlab + +# MySQL installations (note: the line below states '--without ... postgres') +sudo -u git -H bundle install --without development test postgres --deployment + +# PostgreSQL installations (note: the line below states '--without ... mysql') +sudo -u git -H bundle install --without development test mysql --deployment + + +# Run database migrations +sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production + +# Clean up assets and cache +sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production + +# Update init.d script +sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab + +# Update the logrotate configuration (keep logs for 90 days instead of 52 weeks) +sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab + +# Close access to gitlab-satellites for others +sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites +``` + +### 5. Update config files + +#### New configuration options for gitlab.yml + +There are new configuration options available for gitlab.yml. View them with the command below and apply them to your current gitlab.yml if desired. + +``` +git diff 6-7-stable:config/gitlab.yml.example 6-8-stable:config/gitlab.yml.example +``` + +#### MySQL? Remove reaping frequency + +If you are using MySQL as a database, remove `reaping_frequency` from you database.yml to prevent crashes. [Relevant commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/5163a8fcb9cfd63435560fda00173b76df2ccc93). + +#### HTTPS? Disable gzip + +If you are using HTTPS, disable gzip as in [this commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/563fec734912d81cd7caea6fa8ec2b397fb72a9b) to prevent BREACH attacks. + +#### Turn on asset compression + +To improve performance, enable gzip asset compression as seen [in this commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/8af94ed75505f0253823b9b2d44320fecea5b5fb). + +### 6. Update Init script + +```bash +sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab +sudo chmod +x /etc/init.d/gitlab +``` + +### 7. Start application + + sudo service gitlab start + sudo service nginx restart + +### 8. Check application status + +Check if GitLab and its environment are configured correctly: + + sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production + +To make sure you didn't miss anything run a more thorough check with: + + sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production + +If all items are green, then congratulations upgrade is complete! + +## Things went south? Revert to previous version (6.6) + +### 1. Revert the code to the previous version +Follow the [`upgrade guide from 6.5 to 6.6`](6.5-to-6.6.md), except for the database migration +(The backup is already migrated to the previous version) + +### 2. Restore from the backup: + +```bash +cd /home/git/gitlab +sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production +``` +If you have more than one backup *.tar file(s) please add `BACKUP=timestamp_of_backup` to the command above. From f931195d341f8bf8baa80e33c019fcb10045af97 Mon Sep 17 00:00:00 2001 From: Job van der Voort Date: Thu, 17 Apr 2014 10:47:35 +0200 Subject: [PATCH 4/4] bump versions in update guide --- doc/update/6.7-to-6.8.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/update/6.7-to-6.8.md b/doc/update/6.7-to-6.8.md index 2bf04d3967b..57918bca82d 100644 --- a/doc/update/6.7-to-6.8.md +++ b/doc/update/6.7-to-6.8.md @@ -21,7 +21,7 @@ sudo -u git -H git fetch --all For Gitlab Community Edition: ```bash -sudo -u git -H git checkout 6-7-stable +sudo -u git -H git checkout 6-8-stable ``` OR @@ -29,7 +29,7 @@ OR For GitLab Enterprise Edition: ```bash -sudo -u git -H git checkout 6-7-stable-ee +sudo -u git -H git checkout 6-8-stable-ee ``` ### 3. Update gitlab-shell (and its config)