From 6e9439278417e4ba2ed09f646fad8fde4d136d33 Mon Sep 17 00:00:00 2001
From: Praveen Arimbrathodiyil <praveen@debian.org>
Date: Mon, 14 Mar 2016 18:58:24 +0530
Subject: [PATCH] replace gitlab:setup with db:schema:load

---
 debian/changelog     |  3 +++
 debian/rake-tasks.sh | 15 +++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e7d9781e1d..11decb87fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ gitlab (8.4.3+dfsg-10) UNRELEASED; urgency=medium
   * Fix typo in debian/README.Debian.
   * 0038-relax-net-ssh.patch : Add dep3 header.
 
+  [ Pirate Praveen ]
+  * Replace gitlab:setup with db:schema:load and db:seed_fu (Closes: #815798)
+
  -- Balasankar C <balasankarc@autistici.org>  Sun, 28 Feb 2016 22:43:02 +0530
 
 gitlab (8.4.3+dfsg-9) unstable; urgency=medium
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index b6e2572749..0f6066363a 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -18,16 +18,11 @@ if ! [ -f "${gitlab_app_root}/config/secrets.yml" ]; then
   }
 fi
 echo "Initializing database..."
-if [ "$(su postgres -c 'psql gitlab_production -c \\d')" = \
-"No relations found." ]; then
-  su ${gitlab_user} -s /bin/sh -c 'bundle exec rake gitlab:setup \
-  RAILS_ENV=production force=yes'
-  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"
-fi
+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'
 
 echo "Precompiling assets..."
 su ${gitlab_user} -s /bin/sh -c 'bundle exec rake assets:precompile RAILS_ENV=production'