1.1 --- a/cfengine/rc.cfengine Mon Sep 17 19:12:11 2012 +0200
1.2 +++ b/cfengine/rc.cfengine Mon Sep 17 19:13:34 2012 +0200
1.3 @@ -5,8 +5,9 @@
1.4
1.5 %config
1.6 cfengine_enable="$openpkg_rc_def"
1.7 - cfengine_cservd_flags=""
1.8 - cfengine_cenvd_flags=""
1.9 + cfengine_cfserverd_flags=""
1.10 + cfengine_cfexecd_flags=""
1.11 + cfengine_cfmonitord_flags=""
1.12 cfengine_log_prolog="true"
1.13 cfengine_log_epilog="true"
1.14 cfengine_log_numfiles="10"
1.15 @@ -14,15 +15,19 @@
1.16 cfengine_log_complevel="9"
1.17
1.18 %common
1.19 - cfengine_cfservd_pidfile="@l_prefix@/var/cfengine/cfservd.pid"
1.20 - cfengine_cfenvd_pidfile="@l_prefix@/var/cfengine/cfenvd.pid"
1.21 + cfengine_cfserverd_pidfile="@l_prefix@/var/cfengine/cf-serverd.pid"
1.22 + cfengine_cfexecd_pidfile="@l_prefix@/var/cfengine/cf-execd.pid"
1.23 + cfengine_cfmonitord_pidfile="@l_prefix@/var/cfengine/cf-monitord.pid"
1.24 cfengine_signal () {
1.25 - [ -f $cfengine_cfservd_pidfile ] \
1.26 - && kill -$1 `cat $cfengine_cfservd_pidfile`
1.27 + [ -f $cfengine_cfserverd_pidfile ] \
1.28 + && kill -$1 `cat $cfengine_cfserverd_pidfile`
1.29 local rc=$?
1.30 - [ -f $cfengine_cfenvd_pidfile ] \
1.31 - && kill -$1 `cat $cfengine_cfenvd_pidfile` \
1.32 - && [ $rc -eq 0 ]
1.33 + [ -f $cfengine_cfexecd_pidfile ] \
1.34 + && kill -$1 `cat $cfengine_cfexecd_pidfile` \
1.35 + || [ $rc -eq 0 ]
1.36 + [ -f $cfengine_cfmonitord_pidfile ] \
1.37 + && kill -$1 `cat $cfengine_cfmonitord_pidfile` \
1.38 + || [ $rc -eq 0 ]
1.39 }
1.40
1.41 %status -u @l_susr@ -o
1.42 @@ -37,24 +42,18 @@
1.43 %start -u @l_susr@
1.44 rcService cfengine enable yes || exit 0
1.45 rcService cfengine active yes && exit 0
1.46 - ( nohup @l_prefix@/sbin/cfservd \
1.47 - --no-fork $cfengine_cfservd_flags \
1.48 - </dev/null >/dev/null 2>&1 &
1.49 - echo $! >$cfengine_cfservd_pidfile
1.50 - ) >/dev/null 2>&1
1.51 - ( nohup @l_prefix@/sbin/cfenvd \
1.52 - --no-fork $cfengine_cfenvd_flags \
1.53 - </dev/null >/dev/null 2>&1 &
1.54 - echo $! >$cfengine_cfenvd_pidfile
1.55 - ) >/dev/null 2>&1
1.56 + @l_prefix@/var/cfengine/bin/cf-serverd $cfengine_cfserverd_flags
1.57 + @l_prefix@/var/cfengine/bin/cf-execd $cfengine_cfexecd_flags
1.58 + @l_prefix@/var/cfengine/bin/cf-monitord $cfengine_cfmonitord_flags
1.59
1.60 %stop -u @l_susr@
1.61 rcService cfengine enable yes || exit 0
1.62 rcService cfengine active no && exit 0
1.63 cfengine_signal TERM
1.64 sleep 2
1.65 - rm -f $cfengine_cfservd_pidfile 2>/dev/null || true
1.66 - rm -f $cfengine_cfenvd_pidfile 2>/dev/null || true
1.67 + rm -f $cfengine_cfserverd_pidfile 2>/dev/null || true
1.68 + rm -f $cfengine_cfexecd_pidfile 2>/dev/null || true
1.69 + rm -f $cfengine_cfmonitord_pidfile 2>/dev/null || true
1.70
1.71 %restart -u @l_susr@
1.72 rcService cfengine enable yes || exit 0
