From 6ba4b8a9185cceb9082aae4443eeab97cae6c6d7 Mon Sep 17 00:00:00 2001
From: Praveen Arimbrathodiyil <praveen@debian.org>
Date: Tue, 16 Feb 2016 12:14:22 +0530
Subject: [PATCH] install gitlab.conf to tmpfiles.d

---
 debian/{gitlab.tmpfiles => conf/tmpfiles.d/gitlab.conf} | 0
 debian/install                                          | 3 ++-
 debian/postinst                                         | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename debian/{gitlab.tmpfiles => conf/tmpfiles.d/gitlab.conf} (100%)

diff --git a/debian/gitlab.tmpfiles b/debian/conf/tmpfiles.d/gitlab.conf
similarity index 100%
rename from debian/gitlab.tmpfiles
rename to debian/conf/tmpfiles.d/gitlab.conf
diff --git a/debian/install b/debian/install
index 5fe65d3ee5..28c5f1080a 100644
--- a/debian/install
+++ b/debian/install
@@ -6,7 +6,8 @@ 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 usr/share/gitlab/config/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
 debian/rake-tasks.sh usr/lib/gitlab/scripts
diff --git a/debian/postinst b/debian/postinst
index f8ad30fa29..e1fc73e3e7 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -58,8 +58,6 @@ case "$1" in
     done
 
     su ${gitlab_user} -s /bin/sh -c "chmod 750 ${gitlab_uploads_path}"
-    su ${gitlab_user} -s /bin/sh -c "mkdir -p ${gitlab_pid_path}/pids"
-    su ${gitlab_user} -s /bin/sh -c "mkdir -p ${gitlab_pid_path}/sockets"
     su ${gitlab_user} -s /bin/sh -c 'git config --global core.autocrlf "input"'
 
     # Commands below needs to be run from gitlab_home