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

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