make sysconfig/corosync-notifyd usable for systemd

The sysconfig file used by our init script would not be usable for
the sytemd unit got upstream.

Release: 3

diff --git a/corosync-notifyd.init b/corosync-notifyd.init
index c897d8021d112c8ca562db4e2b236f68407a4378..0397d7b23f633acbf416f60901b1d7c2ab3d8f5f 100644 (file)
--- a/corosync-notifyd.init
+++ b/corosync-notifyd.init
@@ -19,9 +19,7 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-SEND_SNMP_TRAPS=no
-SEND_DBUS_SIGNALS=yes
-LOG_ALL_EVENTS=no
+OPTIONS="-d"
 
 [ -f /etc/sysconfig/corosync-notifyd ] && . /etc/sysconfig/corosync-notifyd
 
@@ -37,21 +35,8 @@ start() {
                return
        fi
 
-       local options=""
-       if is_yes "$SEND_SNMP_TRAPS" ; then
-               options="$options -s"
-       fi
-       if [ -n "$SNMP_MANAGER" ] ; then
-               options="$options -m $SNMP_MANAGER"
-       fi
-       if is_yes "$SEND_DBUS_SIGNALS" ; then
-               options="$options -d"
-       fi
-       if is_yes "$LOG_ALL_EVENTS" ; then
-               options="$options -l"
-       fi
        msg_starting "Corosync Notifier"
-       daemon /usr/sbin/corosync-notifyd "$options"
+       daemon /usr/sbin/corosync-notifyd "$OPTIONS"
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/corosync-notifyd
 }

diff --git a/corosync-notifyd.sysconfig b/corosync-notifyd.sysconfig
index c40c6dfc967efeb60bb0e4b7cf2b69b3349f2124..a268cf545f20535249e4666b949ce41ef244efe7 100644 (file)
--- a/corosync-notifyd.sysconfig
+++ b/corosync-notifyd.sysconfig
@@ -1,12 +1,3 @@
 
-# Send SNMP traps on all events.
-SEND_SNMP_TRAPS=no
-
-# SNMP Manager IP address (defaults to localhost).
-#SNMP_MANAGER=
-
-# Send DBUS signals on all events.
-SEND_DBUS_SIGNALS=yes
-
-# Log all events.
-LOG_ALL_EVENTS=no
+# log and signal over DBus all events
+OPTIONS=-l -d

diff --git a/corosync.spec b/corosync.spec
index 579a823e3085dfd14ae5d4127eb7dbfc24a18c14..bb649b88b03936ac49bd7324e3ae5e113c7ce72c 100644 (file)
--- a/corosync.spec
+++ b/corosync.spec
@@ -13,7 +13,7 @@ Summary:      Corosync - OSI Certified implementation of a complete cluster engine
 Summary(pl.UTF-8):     Corosync - implementacja silnika klastrowego certyfikowana przez OSI
 Name:          corosync
 Version:       2.1.0
-Release:       2
+Release:       3
 License:       BSD
 Group:         Base
 Source0:       https://github.com/downloads/corosync/corosync/corosync-2.1.0.tar.gz