Download as
Browse Code »

Commit d54d3324b1ae46a60712dbb974214e41fca5b93b

Authored by Dmitriy Zaporozhets
2 parents ac777911 bd7c3955
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Showing 5 changed files with 5 additions and 4 deletions   Show diff stats
doc/install/installation.md
  Diff comments   View file @d54d332
@@ -181,7 +181,7 @@ You can change `6-9-stable` to `master` if you want the *bleeding edge* version, @@ -181,7 +181,7 @@ You can change `6-9-stable` to `master` if you want the *bleeding edge* version,
181 181
182 # Create directory for satellites 182 # Create directory for satellites
183 sudo -u git -H mkdir /home/git/gitlab-satellites 183 sudo -u git -H mkdir /home/git/gitlab-satellites
184 - sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites 184 + sudo chmod u+rwx,g=rx,o-rwx /home/git/gitlab-satellites
185 185
186 # Make sure GitLab can write to the tmp/pids/ and tmp/sockets/ directories 186 # Make sure GitLab can write to the tmp/pids/ and tmp/sockets/ directories
187 sudo chmod -R u+rwX tmp/pids/ 187 sudo chmod -R u+rwX tmp/pids/
doc/update/6.6-to-6.7.md
  Diff comments   View file @d54d332
@@ -69,7 +69,7 @@ sudo -u git -H gzip /home/git/gitlab/log/*.log.1 @@ -69,7 +69,7 @@ sudo -u git -H gzip /home/git/gitlab/log/*.log.1
69 sudo -u git -H gzip /home/git/gitlab-shell/gitlab-shell.log.1 69 sudo -u git -H gzip /home/git/gitlab-shell/gitlab-shell.log.1
70 70
71 # Close access to gitlab-satellites for others 71 # Close access to gitlab-satellites for others
72 -sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites 72 +sudo chmod u+rwx,g=rx,o-rwx /home/git/gitlab-satellites
73 ``` 73 ```
74 74
75 75
doc/update/6.7-to-6.8.md
  Diff comments   View file @d54d332
@@ -65,7 +65,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab @@ -65,7 +65,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
65 sudo chmod +x /etc/init.d/gitlab 65 sudo chmod +x /etc/init.d/gitlab
66 66
67 # Close access to gitlab-satellites for others 67 # Close access to gitlab-satellites for others
68 -sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites 68 +sudo chmod u+rwx,g=rx,o-rwx /home/git/gitlab-satellites
69 ``` 69 ```
70 70
71 ### 5. Update config files 71 ### 5. Update config files
lib/support/init.d/gitlab
  Diff comments   View file @d54d332
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
12 # Default-Stop: 0 1 6 12 # Default-Stop: 0 1 6
13 # Short-Description: GitLab git repository management 13 # Short-Description: GitLab git repository management
14 # Description: GitLab git repository management 14 # Description: GitLab git repository management
  15 +# chkconfig: - 85 14
15 ### END INIT INFO 16 ### END INIT INFO
16 17
17 18
lib/tasks/gitlab/check.rake
  Diff comments   View file @d54d332
@@ -458,7 +458,7 @@ namespace :gitlab do @@ -458,7 +458,7 @@ namespace :gitlab do
458 else 458 else
459 puts "no".red 459 puts "no".red
460 try_fixing_it( 460 try_fixing_it(
461 - "sudo chmod u+rwx,g+rx,o-rwx #{satellites_path}", 461 + "sudo chmod u+rwx,g=rx,o-rwx #{satellites_path}",
462 ) 462 )
463 for_more_information( 463 for_more_information(
464 see_installation_guide_section "GitLab" 464 see_installation_guide_section "GitLab"