sheepdog now able to run in foreground, so use this in systemd service,
also remove running shell script to get defaults, because it provided
in service file now.

Signed-off-by: Vasiliy Tolstov <[email protected]>
---
 script/sheepdog.service.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/script/sheepdog.service.in b/script/sheepdog.service.in
index ac4f955..3b1206c 100644
--- a/script/sheepdog.service.in
+++ b/script/sheepdog.service.in
@@ -4,12 +4,11 @@ After=network.target
 Wants=syslog.target
 
 [Service]
+Environment="SHEEPDOG_ARGS=--cluster local --log dst=syslog -f --upgrade" 
"SHEEPDOG_PATH=@LOCALSTATEDIR@/lib/sheepdog"
 EnvironmentFile=-@SYSCONFDIR@/conf.d/sheepdog.conf
 EnvironmentFile=-@SYSCONFDIR@/sysconfig/sheepdog
 EnvironmentFile=-@SYSCONFDIR@/default/sheepdog
-ExecStart=/bin/sh -c 'ulimit -n 32768; @SBINDIR@/sheep --pidfile 
@LOCALSTATEDIR@/run/sheep.pid $(if [ -z "$SHEEP_OPTS" ]; then echo "--cluster 
local --log dst=syslog --upgrade @LOCALSTATEDIR@/lib/sheepdog"; else echo 
$SHEEP_OPTS; fi)'
-PIDFile=@LOCALSTATEDIR@/run/sheep.pid
-Type=forking
+ExecStart=@SBINDIR@/sheep $SHEEPDOG_ARGS $SHEEPDOG_PATH
 Restart=on-abort
 StartLimitInterval=10s
 StartLimitBurst=3
-- 
2.3.3

-- 
sheepdog mailing list
[email protected]
https://lists.wpkg.org/mailman/listinfo/sheepdog

Reply via email to