From 26cf41833bcdd5a10e7d76b8f62fcf58ce38e211 Mon Sep 17 00:00:00 2001
From: Praveen Arimbrathodiyil <praveen@debian.org>
Date: Wed, 15 Feb 2017 12:55:30 +0530
Subject: [PATCH] manage tmpfiles.d/gitlab.conf via ucf

---
 debian/conf/gitlab-debian.conf.example                 |  3 +++
 .../tmpfiles.d/{gitlab.conf => gitlab.conf.example}    |  2 +-
 debian/install                                         |  2 +-
 debian/postinst                                        | 10 +++++++++-
 4 files changed, 14 insertions(+), 3 deletions(-)
 rename debian/conf/tmpfiles.d/{gitlab.conf => gitlab.conf.example} (52%)

diff --git a/debian/conf/gitlab-debian.conf.example b/debian/conf/gitlab-debian.conf.example
index 39a68fcf14..53cff731e0 100644
--- a/debian/conf/gitlab-debian.conf.example
+++ b/debian/conf/gitlab-debian.conf.example
@@ -20,6 +20,9 @@ gitlab_shell_root=/usr/share/gitlab-shell
 gitlab_shell_log=/var/log/gitlab-shell
 gitlab_log_dir=/var/log/gitlab
 gitlab_pid_path=/run/gitlab
+gitlab_tmpfiles_example=/var/lib/gitlab/tmpfiles.d/gitlab.conf.example
+gitlab_tmpfiles_private=/var/lib/gitlab/tmpfiles.d/gitlab.conf
+gitlab_tmpfiles=/usr/lib/tmpfiles.d/gitlab.conf
 nginx_user=www-data
 nginx_conf_example=/usr/share/doc/gitlab/nginx.conf.example
 nginx_ssl_conf_example_gz=/usr/share/doc/gitlab/nginx.ssl.conf.example.gz
diff --git a/debian/conf/tmpfiles.d/gitlab.conf b/debian/conf/tmpfiles.d/gitlab.conf.example
similarity index 52%
rename from debian/conf/tmpfiles.d/gitlab.conf
rename to debian/conf/tmpfiles.d/gitlab.conf.example
index 95bae81794..7dabdeec5b 100644
--- a/debian/conf/tmpfiles.d/gitlab.conf
+++ b/debian/conf/tmpfiles.d/gitlab.conf.example
@@ -1,2 +1,2 @@
-d /run/gitlab 2750 gitlab www-data -
+d /run/gitlab 2750 GITLAB_USER www-data -
 L /run/gitlab/cache - - - - /var/cache/gitlab
diff --git a/debian/install b/debian/install
index b82a20f5ea..41b6727a7c 100644
--- a/debian/install
+++ b/debian/install
@@ -6,7 +6,7 @@ debian/conf/resque.yml etc/gitlab
 debian/conf/gitlab-debian.conf.example usr/share/doc/gitlab
 debian/conf/*.target lib/systemd/system
 debian/conf/smtp_settings.rb etc/gitlab/initializers
-debian/conf/tmpfiles.d/gitlab.conf usr/lib/tmpfiles.d
+debian/conf/tmpfiles.d/gitlab.conf.example var/lib/gitlab/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 4858540097..ad7751992c 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -186,7 +186,15 @@ EOF
 	  fi
         fi
       fi
-        
+
+      # Manage tmpfiles.d/gitlab.conf via ucf
+      test -f ${gitlab_tmpfiles_private} || \
+      cp ${gitlab_tmpfiles_example} ${gitlab_tmpfiles_private}
+      sed -i "s/GITLAB_USER/${gitlab_user}/" ${gitlab_tmpfiles_private}
+      echo "Registering ${gitlab_tmpfiles} via ucf"
+      ucf --debconf-ok --three-way ${gitlab_tmpfiles_private} ${gitlab_tmpfiles}
+      ucfr gitlab ${gitlab_tmpfiles}
+
       # Manage gitlab-shell's config.yml via ucf
       mkdir -p /etc/gitlab-shell
       echo "Registering ${gitlab_shell_config} via ucf"