summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-30 16:59:02 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-30 16:59:02 +0300
commitbd7c3955b10d0feb0f1905c0272393fd959e4358 (patch)
treef879a6b133b0d64ec0fd397169a348307dc2e85f
parent7a75b3f3005e2f835d6c5aab520d847d19ab034d (diff)
parenta5e20638c2ca2317f88261cd627b2d8453e4445e (diff)
downloadgitlab-ce-bd7c3955b10d0feb0f1905c0272393fd959e4358.tar.gz
Merge pull request #6882 from Tandrial/master
Satellites access fix
-rw-r--r--doc/install/installation.md2
-rw-r--r--doc/update/6.6-to-6.7.md2
-rw-r--r--doc/update/6.7-to-6.8.md2
-rw-r--r--lib/tasks/gitlab/check.rake2
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 00eab62c070..99731130624 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -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/
diff --git a/doc/update/6.6-to-6.7.md b/doc/update/6.6-to-6.7.md
index 61a63057d08..3093923007a 100644
--- a/doc/update/6.6-to-6.7.md
+++ b/doc/update/6.6-to-6.7.md
@@ -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
```
diff --git a/doc/update/6.7-to-6.8.md b/doc/update/6.7-to-6.8.md
index cb19d235819..1afcb9f9c69 100644
--- a/doc/update/6.7-to-6.8.md
+++ b/doc/update/6.7-to-6.8.md
@@ -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
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index ad5e04ecab9..8a7f39599ab 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -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"