Normalize PID location for Sidekiq where Gitlab's is and drop bogus log redirection

The log redirection trips up systemd as it can't actually show anything
useful about the state of the process in the system journal or with
`systemctl status`. We're already logging the process messages from the
main Gitlab service the normal systemd way, so let it happen for Sidekiq
too.

5 files changed, 14 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ffde0f06165b..d91d733e7769 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Apr  9 06:55:09 UTC 2016
+# Sat Apr  9 07:30:05 UTC 2016
 pkgbase = gitlab
 	pkgdesc = Project management and code hosting application
 	pkgver = 8.6.5
-	pkgrel = 2
+	pkgrel = 3
 	url = http://gitlab.org/gitlab-ce
 	install = gitlab.install
 	arch = i686
@@ -48,10 +48,10 @@ pkgbase = gitlab
 	source = nginx-ssl.conf.example
 	source = lighttpd.conf.example
 	sha512sums = 046a82ab7114847e783dd6225a3c20c67344d204b041e8bf8b0300da3f9b5160072d7b7b2966a53e41b81411d3313724c4c99891302cf5ccfb06cd4d2d53ebea
-	sha512sums = 5dd7a940eee6a84095478af514dcc98c4fc6c4a214de1ddfa4a1e727d4ba34984d66d51affd7844ffebb75fed8f781b38a0da80fba6a5b8fa832948ab39b2249
-	sha512sums = 2c9d8c650a1808d730bb0f6c45ea8fe2f354d56a5bea1da7eb17dc687ec06b731472af842f4cce0704bf738b5a88001a06e1907d18a35d363e88c4dd6f3e9c7d
+	sha512sums = 30dad68383eef226599ec21d1635021f6ed4202325b66be227301143973cd333b2dd0c381b45a01506acae5e62157f1bdb13fb0bdf2b58907a9f5defece23291
+	sha512sums = 4a69a82fa8da4363074cc91838403643d0b214e64f424ffd8573643ad785163970a1234ae2aa4ad1370f31738ac5b1668f394eb9b888e97e583ee2e59dc15dcc
 	sha512sums = c22439ee4cb34adf42de7619a2b83b02359cada38cbe99dd3031e6e72225ec4b2c2d6306331eadfc1c2044609b7a7e8bceddf7be213b5d4dbcaff86b35fe1ce7
-	sha512sums = ab91a9dc81646572cbfc625d942326fa7e49a582c4e868fda7f08b8731b93b46adf9c0322d7c93074b900d4886372f1251e3f871cdfda8fe2da2419affa56f96
+	sha512sums = 6ccd4398c99fd637a4eae519a9313b0f4442439615d05fd2be7ee8b03809009a182e456ad71781dbca3afc47180452f1c3bd18fe0ed261502318dfa921a6cd3a
 	sha512sums = c11d2c59da8325551a465227096e8d39b0e4bcd5b1db21565cf3439e431838c04bc00aa6f07f4d493f3f47fd6b4e25aeb0fe0fc1a05756064706bf5708c960ec
 	sha512sums = c519a51d31300074ea12594fbcc8e9610d991ef04b1dac94d93a2b201df3465999cc7c6ac7f3896e02b117c2366d61dea1ef2f6b9cd7b18998385a7f26e5700f
 	sha512sums = 4fe532dabea64189bf25d271cccc11481b22451704e10efac01c7ca4ad76a532fce82088b5eea9546aa80c1141d716820bb23de81c9093dac87f70c94910fb02
diff --git a/PKGBUILD b/PKGBUILD
index 09fb12730663..81bde8e34ddb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=gitlab
 pkgver=8.6.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Project management and code hosting application"
 arch=('i686' 'x86_64')
 url="http://gitlab.org/gitlab-ce"
@@ -49,10 +49,10 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/gitlabhq/gitlabhq/archive/v
 	lighttpd.conf.example)
 install='gitlab.install'
 sha512sums=('046a82ab7114847e783dd6225a3c20c67344d204b041e8bf8b0300da3f9b5160072d7b7b2966a53e41b81411d3313724c4c99891302cf5ccfb06cd4d2d53ebea'
-            '5dd7a940eee6a84095478af514dcc98c4fc6c4a214de1ddfa4a1e727d4ba34984d66d51affd7844ffebb75fed8f781b38a0da80fba6a5b8fa832948ab39b2249'
-            '2c9d8c650a1808d730bb0f6c45ea8fe2f354d56a5bea1da7eb17dc687ec06b731472af842f4cce0704bf738b5a88001a06e1907d18a35d363e88c4dd6f3e9c7d'
+            '30dad68383eef226599ec21d1635021f6ed4202325b66be227301143973cd333b2dd0c381b45a01506acae5e62157f1bdb13fb0bdf2b58907a9f5defece23291'
+            '4a69a82fa8da4363074cc91838403643d0b214e64f424ffd8573643ad785163970a1234ae2aa4ad1370f31738ac5b1668f394eb9b888e97e583ee2e59dc15dcc'
             'c22439ee4cb34adf42de7619a2b83b02359cada38cbe99dd3031e6e72225ec4b2c2d6306331eadfc1c2044609b7a7e8bceddf7be213b5d4dbcaff86b35fe1ce7'
-            'ab91a9dc81646572cbfc625d942326fa7e49a582c4e868fda7f08b8731b93b46adf9c0322d7c93074b900d4886372f1251e3f871cdfda8fe2da2419affa56f96'
+            '6ccd4398c99fd637a4eae519a9313b0f4442439615d05fd2be7ee8b03809009a182e456ad71781dbca3afc47180452f1c3bd18fe0ed261502318dfa921a6cd3a'
             'c11d2c59da8325551a465227096e8d39b0e4bcd5b1db21565cf3439e431838c04bc00aa6f07f4d493f3f47fd6b4e25aeb0fe0fc1a05756064706bf5708c960ec'
             'c519a51d31300074ea12594fbcc8e9610d991ef04b1dac94d93a2b201df3465999cc7c6ac7f3896e02b117c2366d61dea1ef2f6b9cd7b18998385a7f26e5700f'
             '4fe532dabea64189bf25d271cccc11481b22451704e10efac01c7ca4ad76a532fce82088b5eea9546aa80c1141d716820bb23de81c9093dac87f70c94910fb02'
@@ -120,7 +120,6 @@ prepare() {
 	for __srv in gitlab-sidekiq.service gitlab-unicorn.service gitlab.logrotate gitlab.tmpfiles.d gitlab-backup.service gitlab-mailroom.service; do
 		sed -i "s|<HOMEDIR>|${_homedir}|g" "${srcdir}/${__srv}"
 		sed -i "s|<DATADIR>|${_datadir}|g" "${srcdir}/${__srv}"
-		sed -i "s|<LOGDIR>|${_logdir}|g" "${srcdir}/${__srv}"
 	done
 }
 
diff --git a/gitlab-mailroom.service b/gitlab-mailroom.service
index 850db79d699d..6d791ef178ea 100644
--- a/gitlab-mailroom.service
+++ b/gitlab-mailroom.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Gitlab mailroom Worker
+Description=Gitlab Mailroom Worker
 Requires=gitlab-unicorn.service
 Wants=gitlab-unicorn.service
 After=gitlab-unicorn.service
diff --git a/gitlab-sidekiq.service b/gitlab-sidekiq.service
index a788a9900b1a..e5d2e3dec920 100644
--- a/gitlab-sidekiq.service
+++ b/gitlab-sidekiq.service
@@ -11,7 +11,7 @@ Group=gitlab
 WorkingDirectory=<DATADIR>
 Environment=RAILS_ENV=production PATH=/opt/ruby2.1/bin:/usr/bin
 SyslogIdentifier=gitlab-sidekiq
-PIDFile=<HOMEDIR>/pids/sidekiq.pid
+PIDFile=/run/gitlab/sidekiq.pid
 
 CapabilityBoundingSet=
 PrivateTmp=true
@@ -23,8 +23,8 @@ ProtectHome=true
 # instead you can safely enable this security feature.
 #NoNewPrivileges=true
 
-ExecStart=/usr/bin/bundle-2.1 exec "sidekiq -q post_receive -q mailers -q system_hook -q incoming_email -q project_web_hook -q gitlab_shell -q common -q default -q archive_repo -e production -L <LOGDIR>/sidekiq.log >> <LOGDIR>/sidekiq.log 2>&1"
-ExecStop=/usr/bin/bundle-2.1 exec "sidekiqctl stop <HOMEDIR>/pids/sidekiq.pid >> <LOGDIR>/sidekiq.log 2>&1"
+ExecStart=/usr/bin/bundle-2.1 exec sidekiq -q post_receive -q mailers -q system_hook -q incoming_email -q project_web_hook -q gitlab_shell -q common -q default -q archive_repo -e production
+ExecStop=/usr/bin/bundle-2.1 exec sidekiqctl stop /run/gitlab/sidekiq.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/gitlab-unicorn.service b/gitlab-unicorn.service
index 780fa6b98fa9..f242593796dc 100644
--- a/gitlab-unicorn.service
+++ b/gitlab-unicorn.service
@@ -22,7 +22,7 @@ ProtectSystem=full
 ProtectHome=true
 NoNewPrivileges=true
 
-ExecStart=/usr/bin/bundle-2.1 exec "unicorn_rails -c <DATADIR>/config/unicorn.rb -E production"
+ExecStart=/usr/bin/bundle-2.1 exec unicorn_rails -c <DATADIR>/config/unicorn.rb -E production
 ExecStop=/usr/bin/kill -QUIT $MAINPID
 ExecReload=/usr/bin/kill -USR2 $MAINPID