[DRE-commits] [gitlab] 03/09: Do not leave dangling symlinks behind after purge

[Dmitry Smirnov]

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

onlyjob pushed a commit to branch master
in repository gitlab.

commit 0e43ba3
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sun Jul 17 17:39:35 2016

    Do not leave dangling symlinks behind after purge
---
 debian/gitlab.links | 3 +++
 debian/postinst     | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/gitlab.links b/debian/gitlab.links
index 541bdd4..07a1572 100644
--- a/debian/gitlab.links
+++ b/debian/gitlab.links
@@ -13,3 +13,6 @@ usr/share/javascript/clipboard/clipboard.js usr/share/gitlab/vendor/assets/javas
 usr/share/javascript/chartjs/Chart.js usr/share/gitlab/vendor/assets/javascripts/chart-lib.min.js
 usr/share/javascript/graphael/g.raphael-min.js usr/share/gitlab/vendor/assets/javascripts/g.raphael-min.js
 usr/share/javascript/graphael/g.bar-min.js usr/share/gitlab/vendor/assets/javascripts/g.bar-min.js
+
+/var/lib/gitlab/.secret    /usr/share/gitlab/.secret
+/var/lib/gitlab/Gemfile.lock    /usr/share/gitlab/Gemfile.lock
diff --git a/debian/postinst b/debian/postinst
index efe33b0..e992c4f 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -209,11 +209,6 @@ EOF
 
     # Create Gemfile.lock and .secret in /var/lib/gitlab
     su ${gitlab_user} -s /bin/sh -c "touch ${gitlab_data_dir}/Gemfile.lock"
-    ln -sf ${gitlab_data_dir}/Gemfile.lock ${gitlab_app_root}/Gemfile.lock
-    
-    if ! [ -e ${gitlab_app_root}/.secret ] ; then
-      ln -sf ${gitlab_data_dir}/.secret ${gitlab_app_root}/.secret
-    fi
 
     echo "Verifying we have all required libraries..."
     su ${gitlab_user} -s /bin/sh -c 'bundle install --local'

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