Author: mcpierce
Date: Mon Dec 3 18:12:54 2012
New Revision: 1416607
URL: http://svn.apache.org/viewvc?rev=1416607&view=rev
Log:
QPID-4487: Remove systemd support and qpidd.service.
The configuration files will instead be provided by the various
distrubitons as needed.
Removed:
qpid/trunk/qpid/cpp/etc/qpidd.service
Modified:
qpid/trunk/qpid/cpp/etc/CMakeLists.txt
qpid/trunk/qpid/cpp/etc/Makefile.am
Modified: qpid/trunk/qpid/cpp/etc/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/CMakeLists.txt?rev=1416607&r1=1416606&r2=1416607&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/etc/CMakeLists.txt Mon Dec 3 18:12:54 2012
@@ -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}
Modified: qpid/trunk/qpid/cpp/etc/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/Makefile.am?rev=1416607&r1=1416606&r2=1416607&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/etc/Makefile.am Mon Dec 3 18:12:54 2012
@@ -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
initddir = $(sysconfdir)/init.d
nobase_initd_SCRIPTS = qpidd qpidd-primary
-systemddir = /usr/lib/systemd/system
-nobase_systemd_SCRIPTS = qpidd.service
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
