File 0001-ldirectord-Add-systemd-unit-file-bnc-86325... of Package resource-agents

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-ldirectord-Add-systemd-unit-file-bnc-863250.patch of Package resource-agents (Revision 76bffb218d185836eb5827750bb7e800)

Currently displaying revision 76bffb218d185836eb5827750bb7e800 , Show latest

From 90e7b31e627057882701d2c33638c977dd4c4922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
Date: Wed, 26 Feb 2014 13:55:00 +0100
Subject: [PATCH 2/3] ldirectord: Add systemd unit file (bnc#863250)

Systemd unit file for the ldirectord service.
---
 configure.ac                             | 27 ++++++++++++++++++++++-----
 ldirectord/Makefile.am                   |  2 +-
 ldirectord/systemd/Makefile.am           | 24 ++++++++++++++++++++++++
 ldirectord/systemd/ldirectord.service.in | 11 +++++++++++
 4 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 ldirectord/systemd/Makefile.am
 create mode 100644 ldirectord/systemd/ldirectord.service.in

diff --git a/configure.ac b/configure.ac
index 84bef31931ba..b82c21adcc82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,26 @@ AC_ARG_WITH(pkg-name,
     [  --with-pkg-name=name     Override package name (if you're a packager needing to pretend) ],
     [ PACKAGE_NAME="$withval" ])
 
+AC_PATH_PROGS(PKGCONFIG, pkg-config)
+if test x"${PKGCONFIG}" = x""; then
+   AC_MSG_ERROR(You need pkgconfig installed in order to build ${PACKAGE})
+fi
+
+AC_ARG_WITH([systemdsystemunitdir],
+     [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],,
+     [with_systemdsystemunitdir=auto])
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [
+     def_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)
+
+     AS_IF([test "x$def_systemdsystemunitdir" = "x"],
+         [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
+                [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
+          with_systemdsystemunitdir=no],
+         [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
+      [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
+
 dnl 
 dnl AM_INIT_AUTOMAKE([1.11.1 foreign dist-bzip2 dist-xz])
 dnl
@@ -451,7 +471,6 @@ AC_PATH_PROGS(PING, ping, /bin/ping)
 AC_PATH_PROGS(IFCONFIG, ifconfig, /sbin/ifconfig)
 AC_PATH_PROGS(MAILCMD, mailx mail, mail)
 AC_PATH_PROGS(EGREP, egrep)
-AC_PATH_PROGS(PKGCONFIG, pkg-config)
 
 AC_SUBST(MAILCMD)
 AC_SUBST(EGREP)
@@ -487,10 +506,6 @@ dnl ===============================================
 AC_CHECK_LIB(socket, socket)			
 AC_CHECK_LIB(gnugetopt, getopt_long)		dnl if available
 
-if test x"${PKGCONFIG}" = x""; then
-   AC_MSG_ERROR(You need pkgconfig installed in order to build ${PACKAGE})
-fi
-
 if test "x${enable_thread_safe}" = "xyes"; then
         GPKGNAME="gthread-2.0"
 else
@@ -861,6 +876,8 @@ ldirectord/ldirectord   					\
 	ldirectord/init.d/ldirectord   				\
 	ldirectord/init.d/ldirectord.debian			\
 	ldirectord/init.d/ldirectord.debian.default		\
+	ldirectord/systemd/Makefile	\
+	ldirectord/systemd/ldirectord.service	\
 	ldirectord/logrotate.d/Makefile				\
 	ldirectord/OCF/Makefile					\
 	ldirectord/OCF/ldirectord				\
diff --git a/ldirectord/Makefile.am b/ldirectord/Makefile.am
index 71461f9a6231..5641e0786860 100644
--- a/ldirectord/Makefile.am
+++ b/ldirectord/Makefile.am
@@ -22,7 +22,7 @@ CLEANFILES	       	= ldirectord.8
 
 EXTRA_DIST              = ldirectord ldirectord.cf
 
-SUBDIRS			= logrotate.d init.d OCF
+SUBDIRS			= logrotate.d init.d OCF systemd
 
 ldirectord.8: ldirectord
 	$(POD2MAN) --section=8 $< > $@
diff --git a/ldirectord/systemd/Makefile.am b/ldirectord/systemd/Makefile.am
new file mode 100644
index 000000000000..d349184901c2
--- /dev/null
+++ b/ldirectord/systemd/Makefile.am
@@ -0,0 +1,24 @@
+#
+# ldirectord: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES    = Makefile.in
+
+if HAVE_SYSTEMD
+systemdsystemunit_DATA = ldirectord.service
+endif
diff --git a/ldirectord/systemd/ldirectord.service.in b/ldirectord/systemd/ldirectord.service.in
new file mode 100644
index 000000000000..4fe9638295c6
--- /dev/null
+++ b/ldirectord/systemd/ldirectord.service.in
@@ -0,0 +1,11 @@
+[Unit]
+Description=Monitor and administer real servers in a LVS cluster of load balanced virtual servers
+
+[Service]
+ExecStart=@sbindir@/ldirectord start
+ExecStartPost=/usr/bin/touch /var/lock/subsys/ldirectord
+ExecStop=@sbindir@/ldirectord stop
+ExecStopPost=/usr/bin/rm -f /var/lock/subsys/ldirectord
+ExecReload=@sbindir@/ldirectord reload
+PIDFile=/var/run/ldirectord.ldirectord.pid
+Type=forking
-- 
1.8.4.5

Places

File 0001-ldirectord-Add-systemd-unit-file-bnc-863250.patch of Package resource-agents (Revision 76bffb218d185836eb5827750bb7e800)

Places