[DRE-commits] [gitlab] 15/17: move uploads to /var

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit c40b9fc787387415e0f496fa9987467eb7faf800
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Feb 13 20:38:31 2016 +0530

    move uploads to /var
---
 debian/gitlab.links | 1 +
 debian/postinst     | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/gitlab.links b/debian/gitlab.links
index c13dc93..18a6d35 100644
--- a/debian/gitlab.links
+++ b/debian/gitlab.links
@@ -1,3 +1,4 @@
+var/lib/gitlab/uploads usr/share/gitlab/public/uploads
 etc/gitlab/unicorn.rb usr/share/gitlab/config/unicorn.rb
 etc/gitlab/database.yml usr/share/gitlab/config/database.yml
 etc/gitlab/gitlab.yml usr/share/gitlab/config/gitlab.yml
diff --git a/debian/postinst b/debian/postinst
index 55afc3a..f8ad30f 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -40,10 +40,11 @@ case "$1" in
     . /usr/lib/gitlab/scripts/adduser.sh
 
     gitlab_repo_path=${gitlab_data_dir}/repositories
+    gitlab_uploads_path=${gitlab_data_dir}/uploads
 
     # Create directories and change ownership
-    for i in ${gitlab_repo_path} ${gitlab_pid_path} ${gitlab_log_dir}\
-    ${gitlab_shell_log}; do
+    for i in ${gitlab_repo_path} ${gitlab_uploads_path} ${gitlab_pid_path}\
+    ${gitlab_log_dir} ${gitlab_shell_log}; do
       mkdir -p $i
       chown -R ${gitlab_user}: $i
     done
@@ -56,7 +57,7 @@ case "$1" in
       chown -R ${gitlab_user}: $i
     done
 
-    su ${gitlab_user} -s /bin/sh -c "mkdir -p -m 750 ${gitlab_home}/public/uploads"
+    su ${gitlab_user} -s /bin/sh -c "chmod 750 ${gitlab_uploads_path}"
     su ${gitlab_user} -s /bin/sh -c "mkdir -p ${gitlab_pid_path}/pids"
     su ${gitlab_user} -s /bin/sh -c "mkdir -p ${gitlab_pid_path}/sockets"
     su ${gitlab_user} -s /bin/sh -c 'git config --global core.autocrlf "input"'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git