Download as
Browse Code »

Commit 51b5509bacdfba1d3ca84a4b56c6bd21942f1d2e

Authored by Dmitriy Zaporozhets
2 parents 8c7d342a c275169a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch '6_3_update' of /home/git/repositories/gitlab/gitlabhq

Showing 1 changed file with 11 additions and 28 deletions   Show diff stats
doc/update/6.2-to-6.3.md
  Diff comments   View file @51b5509
@@ -34,14 +34,7 @@ sudo -u git -H git checkout v1.7.9 # Addresses multiple critical security vulner @@ -34,14 +34,7 @@ sudo -u git -H git checkout v1.7.9 # Addresses multiple critical security vulner
34 34
35 The Gitlab-shell config changed recently, so check for config file changes and make `/home/git/gitlab-shell/config.yml` the same as https://github.com/gitlabhq/gitlab-shell/blob/master/config.yml.example 35 The Gitlab-shell config changed recently, so check for config file changes and make `/home/git/gitlab-shell/config.yml` the same as https://github.com/gitlabhq/gitlab-shell/blob/master/config.yml.example
36 36
37 -### 4. Install additional packages  
38 -  
39 -```bash  
40 -# Add support for lograte for better log file handling  
41 -sudo apt-get install logrotate  
42 -```  
43 -  
44 -### 5. Install libs, migrations, etc. 37 +### 4. Install libs, migrations, etc.
45 38
46 ```bash 39 ```bash
47 cd /home/git/gitlab 40 cd /home/git/gitlab
@@ -49,52 +42,42 @@ cd /home/git/gitlab @@ -49,52 +42,42 @@ cd /home/git/gitlab
49 # MySQL 42 # MySQL
50 sudo -u git -H bundle install --without development test postgres --deployment 43 sudo -u git -H bundle install --without development test postgres --deployment
51 44
52 -#PostgreSQL 45 +# PostgreSQL
53 sudo -u git -H bundle install --without development test mysql --deployment 46 sudo -u git -H bundle install --without development test mysql --deployment
54 47
55 48
  49 +# Run database migrations
56 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production 50 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
57 -sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production  
58 -sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production  
59 -sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production 51 +
  52 +# Clean up assets and cache
  53 +sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production
60 ``` 54 ```
61 55
62 -### 6. Update config files 56 +### 5. Update config files
63 57
64 TIP: to see what changed in gitlab.yml.example in this release use next command: 58 TIP: to see what changed in gitlab.yml.example in this release use next command:
65 59
66 ``` 60 ```
67 git diff 6-2-stable:config/gitlab.yml.example 6-3-stable:config/gitlab.yml.example 61 git diff 6-2-stable:config/gitlab.yml.example 6-3-stable:config/gitlab.yml.example
68 -git diff 6-1-stable:config/gitlab.yml.example 6-3-stable:config/gitlab.yml.example # if you upgrading from 6-1  
69 ``` 62 ```
70 63
71 * Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-3-stable/config/gitlab.yml.example but with your settings. 64 * Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-3-stable/config/gitlab.yml.example but with your settings.
72 * Make `/home/git/gitlab/config/unicorn.rb` same as https://github.com/gitlabhq/gitlabhq/blob/6-3-stable/config/unicorn.rb.example but with your settings. 65 * Make `/home/git/gitlab/config/unicorn.rb` same as https://github.com/gitlabhq/gitlabhq/blob/6-3-stable/config/unicorn.rb.example but with your settings.
73 * Copy rack attack middleware config 66 * Copy rack attack middleware config
74 67
75 -```bash  
76 -sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb  
77 -```  
78 -* Set up logrotate  
79 -  
80 -```bash  
81 -sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab  
82 -```  
83 -  
84 -### 7. Update Init script 68 +### 6. Update Init script
85 69
86 ```bash 70 ```bash
87 -sudo rm /etc/init.d/gitlab  
88 -sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6-3-stable/lib/support/init.d/gitlab 71 +sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
89 sudo chmod +x /etc/init.d/gitlab 72 sudo chmod +x /etc/init.d/gitlab
90 ``` 73 ```
91 74
92 -### 8. Start application 75 +### 7. Start application
93 76
94 sudo service gitlab start 77 sudo service gitlab start
95 sudo service nginx restart 78 sudo service nginx restart
96 79
97 -### 9. Check application status 80 +### 8. Check application status
98 81
99 Check if GitLab and its environment are configured correctly: 82 Check if GitLab and its environment are configured correctly:
100 83