[DRE-commits] [gitlab] 01/08: config in /etc, log a symlink to /var/log/gitlab

[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 e7ab706f71152b9694b793028ac201c75cb42260
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Feb 18 17:04:24 2016 +0530

    config in /etc, log a symlink to /var/log/gitlab
---
 debian/gitlab.links                 | 5 +----
 debian/install                      | 5 ++---
 debian/rules                        | 1 +
 debian/upstream-file-count-check.sh | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/debian/gitlab.links b/debian/gitlab.links
index a459f4f..1e97355 100644
--- a/debian/gitlab.links
+++ b/debian/gitlab.links
@@ -2,10 +2,7 @@ var/lib/gitlab/uploads usr/share/gitlab/public/uploads
 var/log/gitlab usr/share/gitlab/log
 run/gitlab usr/share/gitlab/tmp/pids
 run/gitlab usr/share/gitlab/tmp/sockets
-etc/gitlab/unicorn.rb usr/share/gitlab/config/unicorn.rb
-etc/gitlab/database.yml usr/share/gitlab/config/database.yml
-etc/gitlab/gitlab.yml usr/share/gitlab/config/gitlab.yml
-etc/gitlab/resque.yml usr/share/gitlab/config/resque.yml
+etc/gitlab usr/share/gitlab/config
 usr/share/javascript/jquery-history/jquery.history.min.js usr/share/gitlab/vendor/assets/javascripts/jquery.history.js
 usr/share/javascript/jquery-cookie/jquery.cookie.min.js usr/share/gitlab/vendor/assets/javascripts/jquery.cookie.js
 usr/share/javascript/jquery-nicescroll/jquery.nicescroll.min.js usr/share/gitlab/vendor/assets/javascripts/jquery.nicescroll.min.js
diff --git a/debian/install b/debian/install
index 28c5f10..2fcdef9 100644
--- a/debian/install
+++ b/debian/install
@@ -6,7 +6,7 @@ debian/conf/resque.yml etc/gitlab
 debian/conf/gitlab-debian.conf etc/gitlab
 debian/conf/*.target lib/systemd/system
 debian/conf/*.service lib/systemd/system
-debian/conf/smtp_settings.rb usr/share/gitlab/config/initializers
+debian/conf/smtp_settings.rb etc/gitlab/initializers
 debian/conf/tmpfiles.d/gitlab.conf usr/lib/tmpfiles.d
 debian/adduser.sh usr/lib/gitlab/scripts
 debian/grantpriv.sh usr/lib/gitlab/scripts
@@ -14,7 +14,7 @@ debian/rake-tasks.sh usr/lib/gitlab/scripts
 app usr/share/gitlab
 bin usr/share/gitlab
 CHANGELOG usr/share/gitlab
-config usr/share/gitlab
+config/* etc/gitlab
 config.ru usr/share/gitlab
 CONTRIBUTING.md usr/share/gitlab
 db usr/share/gitlab
@@ -27,7 +27,6 @@ Gemfile usr/share/gitlab
 GITLAB_SHELL_VERSION usr/share/gitlab
 GITLAB_WORKHORSE_VERSION usr/share/gitlab
 lib usr/share/gitlab
-log usr/share/gitlab
 MAINTENANCE.md usr/share/gitlab
 PROCESS.md usr/share/gitlab
 Procfile usr/share/gitlab
diff --git a/debian/rules b/debian/rules
index 87103d5..21b3161 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ override_dh_install:
 	dh_systemd_start gitlab.target
 	# Make sure we are installing all required files in debian/install
 	sh debian/upstream-file-count-check.sh
+	rm -rf debian/gitlab/usr/share/gitlab/tmp/*
 
 override_dh_installinit:
 	dh_installinit --no-start
diff --git a/debian/upstream-file-count-check.sh b/debian/upstream-file-count-check.sh
index ccd31f2..e0a03aa 100644
--- a/debian/upstream-file-count-check.sh
+++ b/debian/upstream-file-count-check.sh
@@ -1,9 +1,9 @@
 ucount=$(ls -1 | wc -l)
 dcount=$(cat debian/install |cut -d' ' -f1|grep -v debian |wc -l)
-ignored=5
+ignored=6
 if ! [ $(echo "$ucount" - "$dcount"|bc) -eq $ignored ]; then
   echo "Found new files added by upstream and not added to debian/install"
-  echo "Add them to debian/install or adjust 'ignored=5'"
+  echo "Add them to debian/install or adjust 'ignored=${ignored}'"
   echo "in debian/upstream-file-count-check.sh as required"
   exit 1
 fi

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