kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Minor editing of the 7.14-to-8.0 update guide

This commit is contained in:
Robert Speicher 2015-09-15 13:24:38 -04:00
parent d9d50c0598
commit d420b608e6
1 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
doc/update/7.14-to-8.0.md
View File

@ -10,9 +10,9 @@ months after this vulnerability became known the GitLab installation guide
still contained instructions that would install the outdated, 'vulnerable' Git still contained instructions that would install the outdated, 'vulnerable' Git
version 2.1.2. version 2.1.2.
Run the following command to get your current Git version. Run the following command to get your current Git version:
``` ```sh
/usr/local/bin/git --version /usr/local/bin/git --version
``` ```
@ -63,28 +63,33 @@ sudo -u git -H git checkout 8-0-stable-ee
```bash ```bash
cd /home/git/gitlab-shell cd /home/git/gitlab-shell
sudo -u git -H git fetch sudo -u git -H git fetch
sudo -u git -H git checkout v2.6.4 sudo -u git -H git checkout v2.6.5
``` ```
### 5. Install gitlab-git-http-server ### 5. Install gitlab-git-http-server
First we download Go 1.5 and install it into /usr/local/go. First we download Go 1.5 and install it into `/usr/local/go`:
curl -O --progress https://storage.googleapis.com/golang/go1.5.linux-amd64.tar.gz ```bash
echo '5817fa4b2252afdb02e11e8b9dc1d9173ef3bd5a go1.5.linux-amd64.tar.gz' | shasum -c - && \ curl -O --progress https://storage.googleapis.com/golang/go1.5.linux-amd64.tar.gz
sudo tar -C /usr/local -xzf go1.5.linux-amd64.tar.gz echo '5817fa4b2252afdb02e11e8b9dc1d9173ef3bd5a go1.5.linux-amd64.tar.gz' | shasum -c - && \
sudo ln -sf /usr/local/go/bin/{go,godoc,gofmt} /usr/local/bin/ sudo tar -C /usr/local -xzf go1.5.linux-amd64.tar.gz
rm go1.5.linux-amd64.tar.gz sudo ln -sf /usr/local/go/bin/{go,godoc,gofmt} /usr/local/bin/
rm go1.5.linux-amd64.tar.gz
```
Now we download gitlab-git-http-server and install it in /home/git/gitlab-git-http-server. Now we download `gitlab-git-http-server` and install it in `/home/git/gitlab-git-http-server`:
cd /home/git ```bash
sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-git-http-server.git cd /home/git
cd gitlab-git-http-server sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-git-http-server.git
sudo -u git -H make cd gitlab-git-http-server
sudo -u git -H make
```
If you put your Git repositories in a directory different from /home/git/repositories, you need to tell gitlab-git-http-server about it via /etc/gitlab/default. If your Git repositories are in a directory other than `/home/git/repositories`,
See lib/support/init.d/gitlab.default.example for the options. you need to tell `gitlab-git-http-server` about it via `/etc/gitlab/default`.
See `lib/support/init.d/gitlab.default.example` for the options.
### 6. Install libs, migrations, etc. ### 6. Install libs, migrations, etc.
@ -111,20 +116,27 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
#### New configuration options for `gitlab.yml` #### New configuration options for `gitlab.yml`
There are new configuration options available for [`gitlab.yml`](config/gitlab.yml.example). View them with the command below and apply them to your current `gitlab.yml`. There are new configuration options available for [`gitlab.yml`](config/gitlab.yml.example). View them with the command below and apply them manually to your current `gitlab.yml`:
``` ```sh
git diff origin/7-14-stable:config/gitlab.yml.example origin/8-0-stable:config/gitlab.yml.example git diff origin/7-14-stable:config/gitlab.yml.example origin/8-0-stable:config/gitlab.yml.example
``````
#### New NGINX configuration
Because of the new gitlab-git-http-server you need to update your NGINX configuration.
If you skip this step 'git clone' and 'git push' over HTTP(S) will stop working.
``` ```
# Remove '-ssl' twice in the diff command below if you use HTTP instead of HTTPS
#### New Nginx configuration
Because of the new `gitlab-git-http-server` you need to update your Nginx
configuration. If you skip this step 'git clone' and 'git push' over HTTP(S)
will stop working.
View changes between the previous recommended Nginx configuration and the
current one:
```sh
# For HTTPS configurations
git diff origin/7-14-stable:lib/support/nginx/gitlab-ssl origin/8-0-stable:lib/support/nginx/gitlab-ssl git diff origin/7-14-stable:lib/support/nginx/gitlab-ssl origin/8-0-stable:lib/support/nginx/gitlab-ssl
# For HTTP configurations
git diff origin/7-14-stable:lib/support/nginx/gitlab origin/8-0-stable:lib/support/nginx/gitlab
``` ```
### 8. Start application ### 8. Start application
@ -138,7 +150,7 @@ Check if GitLab and its environment are configured correctly:
sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production 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: To make sure you didn't miss anything run a more thorough check:
sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
@ -147,13 +159,15 @@ If all items are green, then congratulations, the upgrade is complete!
## Things went south? Revert to previous version (7.14) ## Things went south? Revert to previous version (7.14)
### 1. Revert the code to the previous version ### 1. Revert the code to the previous version
Follow the [upgrade guide from 7.13 to 7.14](7.13-to-7.14.md), except for the database migration Follow the [upgrade guide from 7.13 to 7.14](7.13-to-7.14.md), except for the database migration
(The backup is already migrated to the previous version) (The backup is already migrated to the previous version)
### 2. Restore from the backup: ### 2. Restore from the backup
```bash ```bash
cd /home/git/gitlab cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production 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.
If you have more than one backup `*.tar` file(s) please add `BACKUP=timestamp_of_backup` to the command above.