manage tmpfiles.d/gitlab.conf via ucf

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

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

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

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"