[DRE-commits] [gitlab] 01/01: fix first time install issues

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch syslibs
in repository gitlab.

commit 6296a05bdc87feb6d263af50ce57fc0890f14a6b
Author: Pirate Praveen <praveen at debian.org>
Date:   Wed Dec 13 00:48:01 2017 +0530

    fix first time install issues
---
 debian/gitlab.links  | 1 +
 debian/rake-tasks.sh | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/gitlab.links b/debian/gitlab.links
index 1e8b3c2..8f01ef5 100644
--- a/debian/gitlab.links
+++ b/debian/gitlab.links
@@ -24,4 +24,5 @@ usr/share/javascript/graphael/g.raphael-min.js usr/share/gitlab/vendor/assets/ja
 usr/share/javascript/graphael/g.bar-min.js usr/share/gitlab/vendor/assets/javascripts/g.bar-min.js
 usr/share/javascript/fuzzaldrin/fuzzaldrin-plus.js usr/share/gitlab/vendor/assets/javascripts/fuzzaldrin-plus.js
 /var/lib/gitlab/.gitlab_workhorse_secret    /usr/share/gitlab/.gitlab_workhorse_secret
+/var/lib/gitlab/.gitlab_shell_secret    /usr/share/gitlab/.gitlab_shell_secret
 /var/lib/gitlab/Gemfile.lock    /usr/share/gitlab/Gemfile.lock
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index 1765610..4330d62 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -16,13 +16,14 @@ if [ "$db_relations" = "No relations found." ] || \
   test -f ${gitlab_home}/db/schema.rb || \
   runuser -u ${gitlab_user} -- sh -c \
   "cp ${gitlab_data_dir}/db/schema.rb.template ${gitlab_data_dir}/db/schema.rb"
+  touch ${gitlab_data_dir}/.gitlab_shell_secret
   runuser -u ${gitlab_user} -- sh -c 'bundle exec rake db:schema:load'
-  runuser -u ${gitlab_user} -- sh -c 'bundle exec rake db:seed_fu'
 else
   echo "gitlab_production database is not empty, skipping gitlab setup"
-  runuser -u ${gitlab_user} -- sh -c 'bundle exec rake db:migrate'
 fi
 
+runuser -u ${gitlab_user} -- sh -c 'bundle exec rake db:migrate'
+
 # Restrict permissions for secret files
 chmod 0700 ${gitlab_data_dir}/.gitlab_shell_secret
 

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