[sheepdog] [PATCH] fix systemd support on CentOS/RHEL 7

[Vladislav Gorbunov]

Here is diff:

diff --git a/script/sheepdog.service.in b/script/sheepdog.service.in
index 555083e..e7600cc 100644
--- a/script/sheepdog.service.in
+++ b/script/sheepdog.service.in
@@ -7,7 +7,7 @@ Wants=syslog.target
 EnvironmentFile=- at SYSCONFDIR@/conf.d/sheepdog.conf
 EnvironmentFile=- at SYSCONFDIR@/sysconfig/sheepdog
 EnvironmentFile=- at SYSCONFDIR@/default/sheepdog
-ExecStart=@SBINDIR@/sheep --pidfile @LOCALSTATEDIR@/run/sheep.pid
${SHEEP_OPTS:-"--cluster local --log syslog --pidfile
@LOCALSTATEDIR@/run/sheep.pid --upgrade @LOCALSTATEDIR@/lib/sheepdog"}
+ExecStart=/bin/sh -c '@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



2014-11-28 23:05 GMT+10:00 Vasiliy Tolstov <v.tolstov at selfip.ru>:

> 2014-11-28 6:24 GMT+03:00 Vladislav Gorbunov <vadikgo at gmail.com>:
> > Command:
> >
> > ExecStart=/bin/sh -c '/usr/sbin/sheep --pidfile /var/run/sheep.pid $(if
> [ -z
> > "$SHEEP_OPTS" ]; then echo "--cluster local --log dst=syslog --upgrade
> > /var/lib/sheepdog"; else echo $SHEEP_OPTS; fi)'
> >
> > will work. But may be trust to sheepdog defaults and set:
> >
> > ExecStart=/usr/sbin/sheep --pidfile /var/run/sheep.pid $SHEEP_OPTS
> >
> > This will be more pretty. What do you think?
>
>
> +1 for the first variant. Because zookeeper and corosync cluster types
> needs additional configuration, but if default is local - we can
> create vdi, test and all works fine. If user needs another cluster
> engine - he can configure it and change defaults via env file.
>
> --
> Vasiliy Tolstov,
> e-mail: v.tolstov at selfip.ru
> jabber: vase at selfip.ru
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.wpkg.org/pipermail/sheepdog/attachments/20141129/fb1cdc60/attachment-0004.html>