From 8f5a507d2bf20f33052f8d748d21e7c63f79a7c3 Mon Sep 17 00:00:00 2001
From: "Darryl L. Pierce" <mcpierce@apache.org>
Date: Mon, 3 Dec 2012 18:12:54 +0000
Subject: QPID-4487: Remove systemd support and qpidd.service.

The configuration files will instead be provided by the various
distrubitons as needed.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1416607 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/etc/CMakeLists.txt |  5 -----
 cpp/etc/Makefile.am    |  4 +---
 cpp/etc/qpidd.service  | 13 -------------
 3 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 cpp/etc/qpidd.service

(limited to 'cpp')

diff --git a/cpp/etc/CMakeLists.txt b/cpp/etc/CMakeLists.txt
index d9266537b0..014842c9c7 100644
--- a/cpp/etc/CMakeLists.txt
+++ b/cpp/etc/CMakeLists.txt
@@ -23,11 +23,6 @@ install(FILES qpidc.conf
 install(FILES qpidd.conf
         DESTINATION ${QPID_INSTALL_CONFDIR}
         COMPONENT ${QPID_COMPONENT_BROKER})
-if (UNIX)
-  install(FILES qpidd.service
-          DESTINATION ${QPID_INSTALL_SYSTEMDDIR}
-          COMPONENT ${QPID_COMPONENT_BROKER})
-endif (UNIX)
 if (BUILD_SASL)
   install(FILES sasl2/qpidd.conf
           DESTINATION ${QPID_INSTALL_SASLDIR}
diff --git a/cpp/etc/Makefile.am b/cpp/etc/Makefile.am
index 80c5fc51eb..aa41c65b37 100644
--- a/cpp/etc/Makefile.am
+++ b/cpp/etc/Makefile.am
@@ -20,7 +20,7 @@ SASL_CONF = sasl2/qpidd.conf
 
 EXTRA_DIST = \
 	$(SASL_CONF) \
-	qpidd.service qpidd.in qpidd-primary.in qpidd.conf qpidc.conf CMakeLists.txt \
+	qpidd.in qpidd-primary.in qpidd.conf qpidc.conf CMakeLists.txt \
 	cluster.conf-example.xml.in
 
 confdir = $(sysconfdir)/qpid
@@ -53,5 +53,3 @@ CLEANFILES = qpidd qpidd-primary cluster.conf-example.xml
 initddir = $(sysconfdir)/init.d
 nobase_initd_SCRIPTS = qpidd qpidd-primary
 
-systemddir = /usr/lib/systemd/system
-nobase_systemd_SCRIPTS = qpidd.service
diff --git a/cpp/etc/qpidd.service b/cpp/etc/qpidd.service
deleted file mode 100644
index a6549834f4..0000000000
--- a/cpp/etc/qpidd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=An AMQP message broker daemon.
-Documentation=man:qpidd(1) http://qpid.apache.org/
-Requires=network.target
-
-[Service]
-User=qpidd
-Group=qpidd
-Type=simple
-ExecStart=/usr/sbin/qpidd --config /etc/qpidd.conf
-
-[Install]
-WantedBy=multi-user.target
-- 
cgit v1.2.1