From 0e43ba3ff50e200331b1ba093841836131069d87 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Mon, 18 Jul 2016 03:39:35 +1000 Subject: [PATCH] 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 541bdd4dd0..07a1572d7c 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 efe33b0ef8..e992c4ff6e 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'