[DRE-commits] [gitlab] 03/05: use tmpfiles.d for /run

[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 56a999065b60f5f7b7958933facada2a965c6952
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Feb 15 23:15:45 2016 +0530

    use tmpfiles.d for /run
---
 debian/changelog                     | 1 +
 debian/conf/gitlab-mailroom.service  | 2 --
 debian/conf/gitlab-sidekiq.service   | 2 --
 debian/conf/gitlab-unicorn.service   | 2 --
 debian/conf/gitlab-workhorse.service | 2 --
 debian/gitlab.tmpfiles               | 1 +
 6 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 79a4712..2bcef59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gitlab (8.4.3+dfsg-7) UNRELEASED; urgency=medium
   * bc should be in build-dep (Closes: #814695)
   * fix pid file mismatch between /etc/default/gitlab and systemd service files
     (Closes: #814713)
+  * use tmpfiles.d for /run/gitlab (Closes: #814713) Thanks to Christian Seiler
 
  -- Pirate Praveen <praveen at debian.org>  Mon, 15 Feb 2016 13:01:32 +0530
 
diff --git a/debian/conf/gitlab-mailroom.service b/debian/conf/gitlab-mailroom.service
index ffde0a7..ca3ec27 100644
--- a/debian/conf/gitlab-mailroom.service
+++ b/debian/conf/gitlab-mailroom.service
@@ -16,8 +16,6 @@ After=gitlab-unicorn.service
 [Service]
 User=gitlab
 WorkingDirectory=/usr/share/gitlab
-RuntimeDirectory=gitlab
-RuntimeDirectoryMode=2750
 EnvironmentFile=/etc/gitlab/gitlab-debian.conf
 SyslogIdentifier=gitlab-mailroom
 PIDFile=/run/gitlab/mail_room.pid
diff --git a/debian/conf/gitlab-sidekiq.service b/debian/conf/gitlab-sidekiq.service
index 791f133..761323a 100644
--- a/debian/conf/gitlab-sidekiq.service
+++ b/debian/conf/gitlab-sidekiq.service
@@ -17,8 +17,6 @@ After=redis.service postgresql.service
 Type=forking
 User=gitlab
 WorkingDirectory=/usr/share/gitlab
-RuntimeDirectory=gitlab
-RuntimeDirectoryMode=2750
 EnvironmentFile=/etc/gitlab/gitlab-debian.conf
 SyslogIdentifier=gitlab-sidekiq
 PIDFile=/run/gitlab/sidekiq.pid
diff --git a/debian/conf/gitlab-unicorn.service b/debian/conf/gitlab-unicorn.service
index 10c3b4e..55de0d1 100644
--- a/debian/conf/gitlab-unicorn.service
+++ b/debian/conf/gitlab-unicorn.service
@@ -16,8 +16,6 @@ After=redis.service postgresql.service
 [Service]
 User=gitlab
 WorkingDirectory=/usr/share/gitlab
-RuntimeDirectory=gitlab
-RuntimeDirectoryMode=2750
 EnvironmentFile=/etc/gitlab/gitlab-debian.conf
 SyslogIdentifier=gitlab-unicorn
 PIDFile=/run/gitlab/unicorn.pid
diff --git a/debian/conf/gitlab-workhorse.service b/debian/conf/gitlab-workhorse.service
index 1389ec5..8f5561e 100644
--- a/debian/conf/gitlab-workhorse.service
+++ b/debian/conf/gitlab-workhorse.service
@@ -17,8 +17,6 @@ After=gitlab-unicorn.service
 Type=forking
 User=gitlab
 WorkingDirectory=/usr/share/gitlab
-RuntimeDirectory=gitlab
-RuntimeDirectoryMode=2750
 EnvironmentFile=/etc/gitlab/gitlab-debian.conf
 SyslogIdentifier=gitlab-workhorse
 PIDFile=/run/gitlab/gitlab-workhorse.pid
diff --git a/debian/gitlab.tmpfiles b/debian/gitlab.tmpfiles
new file mode 100644
index 0000000..297c5bb
--- /dev/null
+++ b/debian/gitlab.tmpfiles
@@ -0,0 +1 @@
+d /run/gitlab 2750 gitlab gitlab -

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