summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-02-26 17:58:12 +0000
committerValery Sizov <valery@gitlab.com>2015-02-26 17:58:12 +0000
commit1b20cc7d490b4c2b96bd8cac129b6fca19cd1a26 (patch)
tree14d88eccafb6fae701890758868ecf6f6ea014eb
parentc2b324a9411a3b6150e04976d2b36dd99c7a0887 (diff)
parent1d7900b0e1e2545f122683b1ff6f40cc8beb6759 (diff)
downloadgitlab-shell-1b20cc7d490b4c2b96bd8cac129b6fca19cd1a26.tar.gz
Merge branch 'no-recursive-install' into 'master'
Remove recursive commands from bin/install It is not clear what we need these for anymore. Because these commands would recurse once through all existing files in all Git repositories, and then another time through all directories these commands could take very long on a server with a lot of repositories. We keep the 'chmod' on config.repos_path, to deny world access to all files and directories beneath it. See merge request !63
-rw-r--r--CHANGELOG3
-rwxr-xr-xbin/install3
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 51d1d89..8269ed1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v2.5.4
+ - Remove recursive commands from bin/install
+
v2.5.3
- Improve git-annex integration
diff --git a/bin/install b/bin/install
index 64ae726..9847ae1 100755
--- a/bin/install
+++ b/bin/install
@@ -15,8 +15,7 @@ commands = [
%W(chmod 700 #{key_dir}),
%W(touch #{config.auth_file}),
%W(chmod 600 #{config.auth_file}),
- %W(chmod -R ug+rwX,o-rwx #{config.repos_path}),
- %W(find #{config.repos_path} -type d -exec chmod g+s {} ;)
+ %W(chmod ug+rwX,o-rwx #{config.repos_path}),
]
commands.each do |cmd|