diff --git a/debian/config b/debian/config index f24e0b2ce4..d2720f4e45 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 5d75b09958..bab6d1e7a7 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