home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'update-doc-7-6' into 'master'

Browse Source 
Update Documentation for 7.6 release

Updated install and update docs for 7.6-ee release.

See merge request !271
This commit is contained in:
Job van der Voort
2014-12-18 13:07:49 +00:00
parent 23293de23e 7e048d5772
commit af7d9862ec
4 changed files with 95 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/install/installation.md
+3 -3
View File
@@ -182,10 +182,10 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
# Clone GitLab repository
sudo -u git -H git clone https://gitlab.com/subscribers/gitlab-ee.git -b 7-5-stable-ee gitlab
sudo -u git -H git clone https://gitlab.com/subscribers/gitlab-ee.git -b 7-6-stable-ee gitlab
**Note:** You can change `7-5-stable-ee` to `master` if you want the *bleeding edge* version, but never install master on a production server!
**Note:** You can change `7-6-stable-ee` to `master` if you want the *bleeding edge* version, but never install master on a production server!
### Configure It
@@ -280,7 +280,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
GitLab Shell is an SSH access and repository management software developed specially for GitLab.
# Run the installation task for gitlab-shell (replace `REDIS_URL` if needed):
sudo -u git -H bundle exec rake gitlab:shell:install[v2.2.0] REDIS_URL=unix:/var/run/redis/redis.sock RAILS_ENV=production
sudo -u git -H bundle exec rake gitlab:shell:install[v2.4.0] REDIS_URL=unix:/var/run/redis/redis.sock RAILS_ENV=production
# By default, the gitlab-shell config is generated from your main GitLab config.
# You can review (and modify) the gitlab-shell config as follows:
doc/update/6.x-or-7.x-to-7.5.md → doc/update/6.x-or-7.x-to-7.6.md
+13 -11
View File
@@ -1,6 +1,6 @@
# From 6.x or 7.x to 7.5
# From 6.x or 7.x to 7.6
This allows you to upgrade any version of GitLab from 6.0 and up (including 7.0 and up) to 7.5.
This allows you to upgrade any version of GitLab from 6.0 and up (including 7.0 and up) to 7.6.
## Global issue numbers
@@ -70,7 +70,7 @@ sudo -u git -H git checkout -- db/schema.rb # local changes will be restored aut
For GitLab Community Edition:
```bash
sudo -u git -H git checkout 7-5-stable
sudo -u git -H git checkout 7-6-stable
```
OR
@@ -78,7 +78,7 @@ OR
For GitLab Enterprise Edition:
```bash
sudo -u git -H git checkout 7-5-stable-ee
sudo -u git -H git checkout 7-6-stable-ee
```
## 4. Install additional packages
@@ -119,12 +119,14 @@ sudo apt-get install pkg-config cmake
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch
sudo -u git -H git checkout v2.2.0
sudo -u git -H git checkout v2.4.0
```
## 7. Install libs, migrations, etc.
```bash
sudo apt-get install libkrb5-dev
cd /home/git/gitlab
# MySQL installations (note: the line below states '--without ... postgres')
@@ -154,14 +156,14 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
TIP: to see what changed in `gitlab.yml.example` in this release use next command:
```
git diff 6-0-stable:config/gitlab.yml.example 7-5-stable-ee:config/gitlab.yml.example
git diff 6-0-stable:config/gitlab.yml.example 7-6-stable-ee:config/gitlab.yml.example
```
* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-5-stable-ee/config/gitlab.yml.example but with your settings.
* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-5-stable-ee/config/unicorn.rb.example but with your settings.
* Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v2.2.0/config.yml.example but with your settings.
* HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-5-stable-ee/lib/support/nginx/gitlab but with your settings.
* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-5-stable-ee/lib/support/nginx/gitlab-ssl but with your settings.
* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-6-stable-ee/config/gitlab.yml.example but with your settings.
* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-6-stable-ee/config/unicorn.rb.example but with your settings.
* Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v2.4.0/config.yml.example but with your settings.
* HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-6-stable-ee/lib/support/nginx/gitlab but with your settings.
* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-6-stable-ee/lib/support/nginx/gitlab-ssl but with your settings.
* Copy rack attack middleware config
```bash
doc/update/7.5-to-7.6.md
+1 -3
View File
@@ -1,7 +1,5 @@
# From 7.5 to 7.6
**7.6 is not yet released. This is a preliminary upgrade guide.**
### 0. Stop server
sudo service gitlab stop
@@ -39,7 +37,7 @@ sudo -u git -H git checkout 7-6-stable-ee
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch
sudo -u git -H git checkout v2.2.0
sudo -u git -H git checkout v2.4.0
```
### 4. Install libs, migrations, etc.
doc/update/7.6-ce-to-ee.md
+78
View File
@@ -0,0 +1,78 @@
# From Community Edition 7.6 to Enterprise Edition 7.6
This guide assumes you have a correctly configured and tested installation of GitLab Community Edition 7.6.
If you run into any trouble or if you have any questions please contact us at support@gitlab.com.
### 0. Backup
Make a backup just in case things go south:
(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
```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 the EE code
```bash
cd /home/git/gitlab
sudo -u git -H git remote add ee https://gitlab.com/subscribers/gitlab-ee.git
sudo -u git -H git fetch --all
sudo -u git -H git checkout 7-6-stable-ee
```
### 3. Update config files
* Make `/home/git/gitlab/config/gitlab.yml` same as /home/git/gitlab/config/gitlab.yml.example but with your settings.
### 4. Install libs, migrations, etc.
```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
sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production
```
### 5. Start application
sudo service gitlab start
sudo service nginx restart
### 6. 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 complete!
## Things went wrong? Revert to previous version (Community Edition 7.6)
### 1. Revert the code to the previous version
```bash
cd /home/git/gitlab
sudo -u git -H git checkout 7-6-stable
```
### 2. Restore from the backup:
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
```