Commit 97c9bc056f0e2ec22b4e8ca7abe6badeaf962521

Authored by Dmitriy Zaporozhets
2 parents 90474556 2cc162d6

Merge branch '6-4-fast-track' of /home/git/repositories/gitlab/gitlabhq

Showing 2 changed files with 128 additions and 131 deletions   Show diff stats
doc/update/6.0-to-6.2.md
@@ -1,131 +0,0 @@ @@ -1,131 +0,0 @@
1 -# From 6.0 to 6.2  
2 -  
3 -## Notice  
4 -Security vulnerabilities CVE-2013-4490 and CVE-2013-4489 have been patched in the latest version of GitLab 6.2.  
5 -  
6 -# In 6.1 we remove a lot of deprecated code.  
7 -# You should update to 6.0 before installing 6.1 or higher so all the necessary conversions are run.  
8 -  
9 -### Deprecations  
10 -  
11 -#### Global issue numbers  
12 -  
13 -As of 6.1 issue numbers are project specific. This means all issues are renumbered and get a new number in their url. If you use an old issue number url and the issue number does not exist yet you are redirected to the new one. This conversion does not trigger if the old number already exists for this project, this is unlikely but will happen with old issues and large projects.  
14 -  
15 -### 0. Backup  
16 -  
17 -It's useful to make a backup just in case things go south:  
18 -(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)  
19 -  
20 -```bash  
21 -cd /home/git/gitlab  
22 -sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production  
23 -```  
24 -  
25 -### 1. Stop server  
26 -  
27 - sudo service gitlab stop  
28 -  
29 -### 2. Get latest code  
30 -  
31 -```bash  
32 -cd /home/git/gitlab  
33 -sudo -u git -H git fetch  
34 -sudo -u git -H git checkout 6-2-stable # Latest version of 6-2-stable addresses CVE-2013-4489  
35 -```  
36 -  
37 -  
38 -### 3. Install additional packages  
39 -  
40 -```bash  
41 -# Add support for lograte for better log file handling  
42 -sudo apt-get install logrotate  
43 -```  
44 -  
45 -### 4. Update gitlab-shell  
46 -  
47 -```bash  
48 -cd /home/git/gitlab-shell  
49 -sudo -u git -H git fetch  
50 -sudo -u git -H git checkout v1.7.9 # Addresses multiple critical security vulnerabilities  
51 -```  
52 -  
53 -### 5. Install libs, migrations, etc.  
54 -  
55 -```bash  
56 -cd /home/git/gitlab  
57 -  
58 -# MySQL  
59 -sudo -u git -H bundle install --without development test postgres --deployment  
60 -  
61 -#PostgreSQL  
62 -sudo -u git -H bundle install --without development test mysql --deployment  
63 -  
64 -  
65 -sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production  
66 -sudo -u git -H bundle exec rake migrate_iids RAILS_ENV=production  
67 -sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production  
68 -sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production  
69 -sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production  
70 -```  
71 -  
72 -### 6. Update config files  
73 -  
74 -TIP: to see what changed in gitlab.yml.example in this release use next command:  
75 -  
76 -```  
77 -git diff 6-0-stable:config/gitlab.yml.example 6-2-stable:config/gitlab.yml.example  
78 -```  
79 -  
80 -* Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-2-stable/config/gitlab.yml.example but with your settings.  
81 -* Make `/home/git/gitlab/config/unicorn.rb` same as https://github.com/gitlabhq/gitlabhq/blob/6-2-stable/config/unicorn.rb.example but with your settings.  
82 -* Copy rack attack middleware config  
83 -  
84 -```bash  
85 -sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb  
86 -```  
87 -* Uncomment `config.middleware.use Rack::Attack` in `/home/git/gitlab/config/application.rb`  
88 -* Set up logrotate  
89 -  
90 -```bash  
91 -sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab  
92 -```  
93 -  
94 -### 7. Update Init script  
95 -  
96 -```bash  
97 -sudo rm /etc/init.d/gitlab  
98 -sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6-2-stable/lib/support/init.d/gitlab  
99 -sudo chmod +x /etc/init.d/gitlab  
100 -```  
101 -  
102 -### 8. Start application  
103 -  
104 - sudo service gitlab start  
105 - sudo service nginx restart  
106 -  
107 -### 9. Check application status  
108 -  
109 -Check if GitLab and its environment are configured correctly:  
110 -  
111 - cd /home/git/gitlab  
112 - sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production  
113 -  
114 -To make sure you didn't miss anything run a more thorough check with:  
115 -  
116 - sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production  
117 -  
118 -If all items are green, then congratulations upgrade complete!  
119 -  
120 -## Things went south? Revert to previous version (6.0)  
121 -  
122 -### 1. Revert the code to the previous version  
123 -Follow the [`upgrade guide from 5.4 to 6.0`](5.4-to-6.0.md), except for the database migration  
124 -(The backup is already migrated to the previous version)  
125 -  
126 -### 2. Restore from the backup:  
127 -  
128 -```bash  
129 -cd /home/git/gitlab  
130 -sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production  
131 -```  
doc/update/6.0-to-6.4.md 0 → 100644
@@ -0,0 +1,128 @@ @@ -0,0 +1,128 @@
  1 +# From 6.0 to 6.4
  2 +
  3 +# In 6.1 we remove a lot of deprecated code.
  4 +# You should update to 6.0 before installing 6.1 or higher so all the necessary conversions are run.
  5 +
  6 +### Deprecations
  7 +
  8 +#### Global issue numbers
  9 +
  10 +As of 6.1 issue numbers are project specific. This means all issues are renumbered and get a new number in their url. If you use an old issue number url and the issue number does not exist yet you are redirected to the new one. This conversion does not trigger if the old number already exists for this project, this is unlikely but will happen with old issues and large projects.
  11 +
  12 +### 0. Backup
  13 +
  14 +It's useful to make a backup just in case things go south:
  15 +(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
  16 +
  17 +```bash
  18 +cd /home/git/gitlab
  19 +sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
  20 +```
  21 +
  22 +### 1. Stop server
  23 +
  24 + sudo service gitlab stop
  25 +
  26 +### 2. Get latest code
  27 +
  28 +```bash
  29 +cd /home/git/gitlab
  30 +sudo -u git -H git fetch
  31 +sudo -u git -H git checkout 6-4-stable
  32 +```
  33 +
  34 +
  35 +### 3. Install additional packages
  36 +
  37 +```bash
  38 +# Add support for lograte for better log file handling
  39 +sudo apt-get install logrotate
  40 +```
  41 +
  42 +### 4. Update gitlab-shell
  43 +
  44 +```bash
  45 +cd /home/git/gitlab-shell
  46 +sudo -u git -H git fetch
  47 +sudo -u git -H git checkout v1.8.0 # Addresses multiple critical security vulnerabilities
  48 +```
  49 +
  50 +### 5. Install libs, migrations, etc.
  51 +
  52 +```bash
  53 +cd /home/git/gitlab
  54 +
  55 +# MySQL
  56 +sudo -u git -H bundle install --without development test postgres --deployment
  57 +
  58 +#PostgreSQL
  59 +sudo -u git -H bundle install --without development test mysql --deployment
  60 +
  61 +
  62 +sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
  63 +sudo -u git -H bundle exec rake migrate_iids RAILS_ENV=production
  64 +sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production
  65 +sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
  66 +sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production
  67 +```
  68 +
  69 +### 6. Update config files
  70 +
  71 +TIP: to see what changed in gitlab.yml.example in this release use next command:
  72 +
  73 +```
  74 +git diff 6-0-stable:config/gitlab.yml.example 6-4-stable:config/gitlab.yml.example
  75 +```
  76 +
  77 +* Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-4-stable/config/gitlab.yml.example but with your settings.
  78 +* Make `/home/git/gitlab/config/unicorn.rb` same as https://github.com/gitlabhq/gitlabhq/blob/6-4-stable/config/unicorn.rb.example but with your settings.
  79 +* Copy rack attack middleware config
  80 +
  81 +```bash
  82 +sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
  83 +```
  84 +* Uncomment `config.middleware.use Rack::Attack` in `/home/git/gitlab/config/application.rb`
  85 +* Set up logrotate
  86 +
  87 +```bash
  88 +sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
  89 +```
  90 +
  91 +### 7. Update Init script
  92 +
  93 +```bash
  94 +sudo rm /etc/init.d/gitlab
  95 +sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6-4-stable/lib/support/init.d/gitlab
  96 +sudo chmod +x /etc/init.d/gitlab
  97 +```
  98 +
  99 +### 8. Start application
  100 +
  101 + sudo service gitlab start
  102 + sudo service nginx restart
  103 +
  104 +### 9. Check application status
  105 +
  106 +Check if GitLab and its environment are configured correctly:
  107 +
  108 + cd /home/git/gitlab
  109 + sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
  110 +
  111 +To make sure you didn't miss anything run a more thorough check with:
  112 +
  113 + sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
  114 +
  115 +If all items are green, then congratulations upgrade complete!
  116 +
  117 +## Things went south? Revert to previous version (6.0)
  118 +
  119 +### 1. Revert the code to the previous version
  120 +Follow the [`upgrade guide from 5.4 to 6.0`](5.4-to-6.0.md), except for the database migration
  121 +(The backup is already migrated to the previous version)
  122 +
  123 +### 2. Restore from the backup:
  124 +
  125 +```bash
  126 +cd /home/git/gitlab
  127 +sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
  128 +```