From 7869d2a3f7bd97f983496c102a33f143e607c7e2 Mon Sep 17 00:00:00 2001 From: Praveen Arimbrathodiyil Date: Wed, 20 Jul 2016 20:13:31 +0530 Subject: [PATCH] skip gitlab:shell:install --- debian/changelog | 4 +++- debian/rake-tasks.sh | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index ec617afd2c..53ddfc461d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ gitlab (8.9.0+dfsg-5) UNRELEASED; urgency=medium - * Tighten dependencies. + * Tighten dependencies + * Don't run gitlab:shell:install in postinst (Closes: #831877) + (installed config.yml works) -- Pirate Praveen Thu, 14 Jul 2016 21:04:06 +0530 diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh index f83bef8b6a..dc1d902757 100755 --- a/debian/rake-tasks.sh +++ b/debian/rake-tasks.sh @@ -25,9 +25,6 @@ if [ "$(LANG=C su postgres -c "psql gitlab_production -c \"\d\"")" = \ echo "Initializing database..." su ${gitlab_user} -s /bin/sh -c 'bundle exec rake db:schema:load' su ${gitlab_user} -s /bin/sh -c 'bundle exec rake db:seed_fu' - su ${gitlab_user} -s /bin/sh -c 'bundle exec rake gitlab:shell:install \ - REDIS_URL=redis://localhost:6379 \ - SHELL_ROOT_PATH=/usr/share/gitlab-shell RAILS_ENV=production' else echo "gitlab_production database is not empty, skipping gitlab setup" su ${gitlab_user} -s /bin/sh -c 'bundle exec rake db:migrate'