[DRE-maint] Bug#851648: gitlab-workhorse not logging to file on systemd

[Libor Klepáč]

Package: gitlab
Severity: wishlist

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hi,
just a little patch to enable logging of gitlab-workhorse on systemd.

Don't know, if it's useful, use it if you like it, drop if not.
Personaly i don't like the /bin/sh "hack"

Libor

-----BEGIN PGP SIGNATURE-----

iQJJBAEBCAAzFiEEPGZVVU37tFmB0TQv8O+MbsKfR44FAlh94pwVHGxpYm9yLmts
ZXBhY0BiY29tLmN6AAoJEPDvjG7Cn0eOD4wP/0NTNHL79ykF6zgtQ7Iw9YQJqC9/
8FjaKM9Vr8l/9sfniBo9WLKFdTwMFy74YlFhcX1501qj0Vr+5k487PcYg3hzWKdt
Phgi+WOs1Ca88vew6eVhLTfJrkVU4AJkweobLpccOVIvLDkk7+Qqaoq7myGIeYVy
UKoPDqq41bBbwDWZVQ6t6C6fqFY5+bL4ZG221xFlpktE6xWKQhoSOI4z/g1Gq0Wn
lUEdibrhWll8dg9BSwi3zdXAbsGe1dtWBuTenqaNMk9ey/GI4TaqY1T4w619a9L/
XAwivqPClEjkHl3/2qm1vWpEQmrR98WAA+FxAc0CjoQVyhuWwId8RJJsfXGzjXCj
GTp6HsnLsAiSHsNV2lWnrN677wd0tRH9SCl836mpxZYkgJPTq8wPF8ovgZfzizsm
OX5Y0/NQymNJT+fcESXcvny033sVMrEeTi1NOrw1d4bLKGvmIyJ5OKj3u/JaGLm9
6MfiCbnYLbB1DlJqm/b+HCS6fygcigWHi4xYA03IrXglc1il05h7AO52XVDhTKjZ
bVrXFy4lATxXXeSRqzDy/pWHZ0ZykeREdYwcl+Rp01YvzQgfmajzgwDQkuzfHuu3
Q/IMjVnmDbbJX7LgaYECtmPRAvejHvMOj6ndvdCBHtjc1EZZ+ezwt7NKpLwbdSpj
ckaM8ios8+p9u+QB
=h3uq
-----END PGP SIGNATURE-----
-------------- next part --------------
diff -ur a/debian/gitlab.gitlab-workhorse.service b/debian/gitlab.gitlab-workhorse.service
--- a/debian/gitlab.gitlab-workhorse.service	2016-07-19 11:11:39.000000000 +0200
+++ b/debian/gitlab.gitlab-workhorse.service	2017-01-17 10:18:52.816505949 +0100
@@ -13,14 +13,16 @@
 WorkingDirectory=/usr/share/gitlab
 EnvironmentFile=/etc/gitlab/gitlab-debian.conf
 SyslogIdentifier=gitlab-workhorse
-ExecStart=/usr/bin/gitlab-workhorse \
+ExecStart=/bin/sh -c '/usr/bin/gitlab-workhorse \
     -listenUmask 0 \
     -listenNetwork unix \
     -listenAddr ${gitlab_pid_path}/gitlab-workhorse.socket \
     -authBackend http://127.0.0.1:8080 \
     -authSocket ${gitlab_pid_path}/gitlab.socket \
-    -documentRoot ${gitlab_app_root}/public
+    -documentRoot ${gitlab_app_root}/public \
+    >> ${gitlab_log_dir}/gitlab-workhorse.log 2>&1'
 Restart=on-abnormal
+KillMode=control-group
 
 [Install]
 WantedBy=gitlab.target