Commit 39d95b1d94968bd1fd465bde2790457e74addd06
1 parent
a85aa4e0
Exists in
spb-stable
and in
2 other branches
Update installation guide, create update guide.
Showing
2 changed files
with
104 additions
and
8 deletions
Show diff stats
doc/install/installation.md
| @@ -86,7 +86,7 @@ Is the system packaged Git too old? Remove it and compile from source. | @@ -86,7 +86,7 @@ Is the system packaged Git too old? Remove it and compile from source. | ||
| 86 | mail server. By default, Debian is shipped with exim4 whereas Ubuntu | 86 | mail server. By default, Debian is shipped with exim4 whereas Ubuntu |
| 87 | does not ship with one. The recommended mail server is postfix and you can install it with: | 87 | does not ship with one. The recommended mail server is postfix and you can install it with: |
| 88 | 88 | ||
| 89 | - sudo apt-get install -y postfix | 89 | + sudo apt-get install -y postfix |
| 90 | 90 | ||
| 91 | Then select 'Internet Site' and press enter to confirm the hostname. | 91 | Then select 'Internet Site' and press enter to confirm the hostname. |
| 92 | 92 | ||
| @@ -150,13 +150,13 @@ NOTE: because we need to make use of extensions you need at least pgsql 9.1. | @@ -150,13 +150,13 @@ NOTE: because we need to make use of extensions you need at least pgsql 9.1. | ||
| 150 | ## Clone the Source | 150 | ## Clone the Source |
| 151 | 151 | ||
| 152 | # Clone GitLab repository | 152 | # Clone GitLab repository |
| 153 | - sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 6-8-stable gitlab | 153 | + sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 6-9-stable gitlab |
| 154 | 154 | ||
| 155 | # Go to gitlab dir | 155 | # Go to gitlab dir |
| 156 | cd /home/git/gitlab | 156 | cd /home/git/gitlab |
| 157 | 157 | ||
| 158 | **Note:** | 158 | **Note:** |
| 159 | -You can change `6-8-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! | 159 | +You can change `6-9-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! |
| 160 | 160 | ||
| 161 | ## Configure it | 161 | ## Configure it |
| 162 | 162 | ||
| @@ -261,7 +261,7 @@ GitLab Shell is an ssh access and repository management software developed speci | @@ -261,7 +261,7 @@ GitLab Shell is an ssh access and repository management software developed speci | ||
| 261 | cd /home/git/gitlab | 261 | cd /home/git/gitlab |
| 262 | 262 | ||
| 263 | # Run the installation task for gitlab-shell (replace `REDIS_URL` if needed): | 263 | # Run the installation task for gitlab-shell (replace `REDIS_URL` if needed): |
| 264 | - sudo -u git -H bundle exec rake gitlab:shell:install[v1.9.3] REDIS_URL=redis://localhost:6379 RAILS_ENV=production | 264 | + sudo -u git -H bundle exec rake gitlab:shell:install[v1.9.4] REDIS_URL=redis://localhost:6379 RAILS_ENV=production |
| 265 | 265 | ||
| 266 | # By default, the gitlab-shell config is generated from your main gitlab config. You can review (and modify) it as follows: | 266 | # By default, the gitlab-shell config is generated from your main gitlab config. You can review (and modify) it as follows: |
| 267 | sudo -u git -H editor /home/git/gitlab-shell/config.yml | 267 | sudo -u git -H editor /home/git/gitlab-shell/config.yml |
| @@ -409,22 +409,22 @@ GitLab uses [Omniauth](http://www.omniauth.org/) for authentication and already | @@ -409,22 +409,22 @@ GitLab uses [Omniauth](http://www.omniauth.org/) for authentication and already | ||
| 409 | These steps are fairly general and you will need to figure out the exact details from the Omniauth provider's documentation. | 409 | These steps are fairly general and you will need to figure out the exact details from the Omniauth provider's documentation. |
| 410 | 410 | ||
| 411 | * Stop GitLab | 411 | * Stop GitLab |
| 412 | - `sudo service gitlab stop` | 412 | + `sudo service gitlab stop` |
| 413 | 413 | ||
| 414 | * Add provider specific configuration options to your `config/gitlab.yml` (you can use the [auth providers section of the example config](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example) as a reference) | 414 | * Add provider specific configuration options to your `config/gitlab.yml` (you can use the [auth providers section of the example config](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example) as a reference) |
| 415 | 415 | ||
| 416 | * Add the gem to your [Gemfile](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/Gemfile) | 416 | * Add the gem to your [Gemfile](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/Gemfile) |
| 417 | `gem "omniauth-your-auth-provider"` | 417 | `gem "omniauth-your-auth-provider"` |
| 418 | * If you're using MySQL, install the new Omniauth provider gem by running the following command: | 418 | * If you're using MySQL, install the new Omniauth provider gem by running the following command: |
| 419 | - `sudo -u git -H bundle install --without development test postgres --path vendor/bundle --no-deployment` | 419 | + `sudo -u git -H bundle install --without development test postgres --path vendor/bundle --no-deployment` |
| 420 | 420 | ||
| 421 | * If you're using PostgreSQL, install the new Omniauth provider gem by running the following command: | 421 | * If you're using PostgreSQL, install the new Omniauth provider gem by running the following command: |
| 422 | - `sudo -u git -H bundle install --without development test mysql --path vendor/bundle --no-deployment` | 422 | + `sudo -u git -H bundle install --without development test mysql --path vendor/bundle --no-deployment` |
| 423 | 423 | ||
| 424 | > These are the same commands you used in the [Install Gems section](#install-gems) with `--path vendor/bundle --no-deployment` instead of `--deployment`. | 424 | > These are the same commands you used in the [Install Gems section](#install-gems) with `--path vendor/bundle --no-deployment` instead of `--deployment`. |
| 425 | 425 | ||
| 426 | * Start GitLab | 426 | * Start GitLab |
| 427 | - `sudo service gitlab start` | 427 | + `sudo service gitlab start` |
| 428 | 428 | ||
| 429 | 429 | ||
| 430 | ### Examples | 430 | ### Examples |
| @@ -0,0 +1,96 @@ | @@ -0,0 +1,96 @@ | ||
| 1 | +# From 6.8 to 6.9 | ||
| 2 | + | ||
| 3 | +### 0. Backup | ||
| 4 | + | ||
| 5 | +```bash | ||
| 6 | +cd /home/git/gitlab | ||
| 7 | +sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production | ||
| 8 | +``` | ||
| 9 | + | ||
| 10 | +### 1. Stop server | ||
| 11 | + | ||
| 12 | +```bash | ||
| 13 | +sudo service gitlab stop | ||
| 14 | +``` | ||
| 15 | + | ||
| 16 | +### 2. Get latest code | ||
| 17 | + | ||
| 18 | +```bash | ||
| 19 | +cd /home/git/gitlab | ||
| 20 | +sudo -u git -H git fetch --all | ||
| 21 | +``` | ||
| 22 | + | ||
| 23 | +For Gitlab Community Edition: | ||
| 24 | + | ||
| 25 | +```bash | ||
| 26 | +sudo -u git -H git checkout 6-9-stable | ||
| 27 | +``` | ||
| 28 | + | ||
| 29 | +OR | ||
| 30 | + | ||
| 31 | +For GitLab Enterprise Edition: | ||
| 32 | + | ||
| 33 | +```bash | ||
| 34 | +sudo -u git -H git checkout 6-9-stable-ee | ||
| 35 | +``` | ||
| 36 | + | ||
| 37 | +### 3. Update gitlab-shell (and its config) | ||
| 38 | + | ||
| 39 | +```bash | ||
| 40 | +cd /home/git/gitlab-shell | ||
| 41 | +sudo -u git -H git fetch | ||
| 42 | +sudo -u git -H git checkout v1.9.4 | ||
| 43 | +``` | ||
| 44 | + | ||
| 45 | +### 4. Install libs, migrations, etc. | ||
| 46 | + | ||
| 47 | +```bash | ||
| 48 | +cd /home/git/gitlab | ||
| 49 | + | ||
| 50 | +# MySQL installations (note: the line below states '--without ... postgres') | ||
| 51 | +sudo -u git -H bundle install --without development test postgres --deployment | ||
| 52 | + | ||
| 53 | +# PostgreSQL installations (note: the line below states '--without ... mysql') | ||
| 54 | +sudo -u git -H bundle install --without development test mysql --deployment | ||
| 55 | +``` | ||
| 56 | + | ||
| 57 | +### 5. Update config files | ||
| 58 | + | ||
| 59 | +#### New configuration options for gitlab.yml | ||
| 60 | + | ||
| 61 | +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. | ||
| 62 | + | ||
| 63 | +``` | ||
| 64 | +git diff 6-8-stable:config/gitlab.yml.example 6-9-stable:config/gitlab.yml.example | ||
| 65 | +``` | ||
| 66 | + | ||
| 67 | +### 6. Start application | ||
| 68 | + | ||
| 69 | + sudo service gitlab start | ||
| 70 | + sudo service nginx restart | ||
| 71 | + | ||
| 72 | +### 7. Check application status | ||
| 73 | + | ||
| 74 | +Check if GitLab and its environment are configured correctly: | ||
| 75 | + | ||
| 76 | + sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production | ||
| 77 | + | ||
| 78 | +To make sure you didn't miss anything run a more thorough check with: | ||
| 79 | + | ||
| 80 | + sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production | ||
| 81 | + | ||
| 82 | +If all items are green, then congratulations upgrade is complete! | ||
| 83 | + | ||
| 84 | +## Things went south? Revert to previous version (6.8) | ||
| 85 | + | ||
| 86 | +### 1. Revert the code to the previous version | ||
| 87 | +Follow the [`upgrade guide from 6.7 to 6.8`](6.7-to-6.8.md), except for the database migration | ||
| 88 | +(The backup is already migrated to the previous version) | ||
| 89 | + | ||
| 90 | +### 2. Restore from the backup: | ||
| 91 | + | ||
| 92 | +```bash | ||
| 93 | +cd /home/git/gitlab | ||
| 94 | +sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production | ||
| 95 | +``` | ||
| 96 | +If you have more than one backup *.tar file(s) please add `BACKUP=timestamp_of_backup` to the command above. |