[DRE-commits] [gitlab] 07/07: remove dbconfig-common

[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 39561c1c7fbe006d66748302e18d3140913a4016
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Oct 24 13:21:59 2015 +0530

    remove dbconfig-common
---
 debian/config   | 11 -----------
 debian/postinst | 12 +++---------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/debian/config b/debian/config
index f24e0b2..d2720f4 100644
--- a/debian/config
+++ b/debian/config
@@ -9,14 +9,3 @@ set -e
 # DB password can be left blank
 db_input high gitlab/dbpass || true
 db_go || true
-
-# source dbconfig-common shell library, and call the hook function
-if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
-   . /usr/share/dbconfig-common/dpkg/config.pgsql
-  dbc_dbname="gitlab_production"
-  dbc_dbuser="gitlab"
-  if ! dbc_go gitlab $@; then
-    echo 'Automatic database configuration using dbconfig-common failed!'
-  fi
-fi
-
diff --git a/debian/postinst b/debian/postinst
index 5d75b09..bab6d1e 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -28,20 +28,14 @@ set -e
 
 case "$1" in
     configure)
-	# Show debconf questions
-        . /usr/share/debconf/confmodule
-        . /usr/share/dbconfig-common/dpkg/postinst.pgsql
-
-        dbc_dbname="gitlab_production"
-        dbc_dbuser="gitlab"
-
-        dbc_go gitlab $@
-
 	. /etc/gitlab/gitlab-debian.conf
 	. /usr/lib/gitlab/scripts/adduser.sh
 	chown -R ${gitlab_user}: ${gitlab_home}
 	cd ${gitlab_home}
 	
+	# Show debconf questions
+        . /usr/share/debconf/confmodule
+
 	echo "Setting up environment varibales..."
 	export RAILS_ENV=production
 	export DB=postgres

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