Download as
Browse Code »

Commit faa6a34a17ef12fe29fd39cf29b0f2889bfa6144

Authored by Jacob Vosmaer
1 parent 88c15909
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Bump gitlab-shell in 5.4 and 6.2

Showing 2 changed files with 17 additions and 9 deletions   Show diff stats
doc/update/5.3-to-5.4.md
  Diff comments   View file @faa6a34
@@ -22,7 +22,7 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production @@ -22,7 +22,7 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
22 ```bash 22 ```bash
23 cd /home/git/gitlab 23 cd /home/git/gitlab
24 sudo -u git -H git fetch 24 sudo -u git -H git fetch
25 -sudo -u git -H git checkout 5-4-stable 25 +sudo -u git -H git checkout 5-4-stable # Latest version of 5-4-stable addresses CVE-2013-4489
26 ``` 26 ```
27 27
28 ### 3. Update gitlab-shell 28 ### 3. Update gitlab-shell
@@ -30,7 +30,7 @@ sudo -u git -H git checkout 5-4-stable @@ -30,7 +30,7 @@ sudo -u git -H git checkout 5-4-stable
30 ```bash 30 ```bash
31 cd /home/git/gitlab-shell 31 cd /home/git/gitlab-shell
32 sudo -u git -H git fetch 32 sudo -u git -H git fetch
33 -sudo -u git -H git checkout v1.5.0 33 +sudo -u git -H git checkout v1.7.4 # Addresses CVE-2013-4490
34 ``` 34 ```
35 35
36 ### 4. Install libs, migrations, etc. 36 ### 4. Install libs, migrations, etc.
doc/update/6.1-to-6.2.md
  Diff comments   View file @faa6a34
@@ -24,17 +24,25 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production @@ -24,17 +24,25 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
24 ```bash 24 ```bash
25 cd /home/git/gitlab 25 cd /home/git/gitlab
26 sudo -u git -H git fetch 26 sudo -u git -H git fetch
27 -sudo -u git -H git checkout 6-2-stable 27 +sudo -u git -H git checkout 6-2-stable # Latest version of 6-2-stable addresses CVE-2013-4489
28 ``` 28 ```
29 29
30 -### 3. Install additional packages 30 +### 3. Update gitlab-shell
  31 +
  32 +```bash
  33 +cd /home/git/gitlab-shell
  34 +sudo -u git -H git fetch
  35 +sudo -u git -H git checkout v1.7.4 # Addresses CVE-2013-4490
  36 +```
  37 +
  38 +### 4. Install additional packages
31 39
32 ```bash 40 ```bash
33 # Add support for lograte for better log file handling 41 # Add support for lograte for better log file handling
34 sudo apt-get install logrotate 42 sudo apt-get install logrotate
35 ``` 43 ```
36 44
37 -### 4. Install libs, migrations, etc. 45 +### 5. Install libs, migrations, etc.
38 46
39 ```bash 47 ```bash
40 cd /home/git/gitlab 48 cd /home/git/gitlab
@@ -52,7 +60,7 @@ sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production @@ -52,7 +60,7 @@ sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
52 sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production 60 sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production
53 ``` 61 ```
54 62
55 -### 5. Update config files 63 +### 6. Update config files
56 64
57 TIP: to see what changed in gitlab.yml.example in this release use next command: 65 TIP: to see what changed in gitlab.yml.example in this release use next command:
58 66
@@ -74,7 +82,7 @@ sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers @@ -74,7 +82,7 @@ sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers
74 sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab 82 sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
75 ``` 83 ```
76 84
77 -### 6. Update Init script 85 +### 7. Update Init script
78 86
79 ```bash 87 ```bash
80 sudo rm /etc/init.d/gitlab 88 sudo rm /etc/init.d/gitlab
@@ -82,12 +90,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6 @@ -82,12 +90,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6
82 sudo chmod +x /etc/init.d/gitlab 90 sudo chmod +x /etc/init.d/gitlab
83 ``` 91 ```
84 92
85 -### 7. Start application 93 +### 8. Start application
86 94
87 sudo service gitlab start 95 sudo service gitlab start
88 sudo service nginx restart 96 sudo service nginx restart
89 97
90 -### 8. Check application status 98 +### 9. Check application status
91 99
92 Check if GitLab and its environment are configured correctly: 100 Check if GitLab and its environment are configured correctly:
93 101