[PATCH] Do not link to the Qpid client library.
by Jeff Peeler
Similar to the previous commit 70657d75834b9c5a4d92f80ee236a64f5ae9c7f9,
remove Qpid linking requirements.
Signed-off-by: Jeff Peeler <jpeeler(a)redhat.com>
---
src/lib/CMakeLists.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index b64e022..e33e659 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -57,7 +57,7 @@ if(WITH-QMF)
set_target_properties(mcommon_qmf PROPERTIES SOVERSION 1.0.0)
target_link_libraries(mcommon_qmf mcommon
- ${QPIDCLIENT_LIBRARY} ${QPIDMESSAGING_LIBRARY} ${QMF2_LIBRARY}
+ ${QPIDMESSAGING_LIBRARY} ${QMF2_LIBRARY}
${nss_LIBRARIES})
if(QPIDTYPES_LIBRARY)
target_link_libraries(mcommon_qmf ${QPIDTYPES_LIBRARY})
--
1.7.7.6
12 years, 1 month
[PATCH] Build: Don't start daemons by default
by Zane Bitter
Signed-off-by: Zane Bitter <zbitter(a)redhat.com>
---
sys/matahari-broker.init.in | 2 --
sys/matahari-broker.service.in | 2 +-
sys/matahari-vios-proxy-guest.init.in | 2 --
sys/matahari-vios-proxy-host.init.in | 2 --
sys/matahari-vios-proxy-host.service.in | 2 +-
sys/matahari.init.in | 2 --
sys/matahari.service.in | 2 +-
7 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/sys/matahari-broker.init.in b/sys/matahari-broker.init.in
index 0f03b44..6db78b6 100755
--- a/sys/matahari-broker.init.in
+++ b/sys/matahari-broker.init.in
@@ -25,8 +25,6 @@
# Provides: matahari-broker
# Required-Start: $local_fs
# Required-Stop: $local_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
# Should-Start: matahari-vios-proxy-guest
# Short-Description: start or stop matahari broker
# Description: Matahari Broker is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol.
diff --git a/sys/matahari-broker.service.in b/sys/matahari-broker.service.in
index 5f28f48..dffc9e6 100644
--- a/sys/matahari-broker.service.in
+++ b/sys/matahari-broker.service.in
@@ -4,7 +4,7 @@ After=syslog.target network.target matahari-vios-proxy-guest.service
Requires=syslog.target network.target
[Install]
-WantedBy=multi-user.target
+#WantedBy=multi-user.target
[Service]
Type=simple
diff --git a/sys/matahari-vios-proxy-guest.init.in b/sys/matahari-vios-proxy-guest.init.in
index c85f712..1444b3c 100644
--- a/sys/matahari-vios-proxy-guest.init.in
+++ b/sys/matahari-vios-proxy-guest.init.in
@@ -6,8 +6,6 @@
# Provides:
# Required-Start: $local_fs matahari-broker
# Required-Stop: $local_fs matahari-broker
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
# Short-Description: Starts and stops vios proxy guest daemon
# Description: Matahari initscript for Vios Proxy Guest
### END INIT INFO
diff --git a/sys/matahari-vios-proxy-host.init.in b/sys/matahari-vios-proxy-host.init.in
index 098b9bd..6669ba7 100644
--- a/sys/matahari-vios-proxy-host.init.in
+++ b/sys/matahari-vios-proxy-host.init.in
@@ -6,8 +6,6 @@
# Provides:
# Required-Start: $local_fs matahari-broker
# Required-Stop: $local_fs matahari-broker
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
# Short-Description: Starts and stops vios proxy host daemon
# Description: Matahari initscript for Vios Proxy Host
### END INIT INFO
diff --git a/sys/matahari-vios-proxy-host.service.in b/sys/matahari-vios-proxy-host.service.in
index aa4a77d..bb1336b 100644
--- a/sys/matahari-vios-proxy-host.service.in
+++ b/sys/matahari-vios-proxy-host.service.in
@@ -4,7 +4,7 @@ After=syslog.target
Requires=syslog.target
[Install]
-WantedBy=multi-user.target
+#WantedBy=multi-user.target
[Service]
Type=simple
diff --git a/sys/matahari.init.in b/sys/matahari.init.in
index 18bd572..55bf371 100644
--- a/sys/matahari.init.in
+++ b/sys/matahari.init.in
@@ -7,8 +7,6 @@
# Required-Start: $local_fs
# Required-Stop: $local_fs
# Should-Start: matahari-broker
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
# Short-Description: Starts and stops the @BASE@@BASE_SUB@ matahari daemon
# Description: Matahari @BASE@@BASE_SUB@ daemon using the AMQP protocol.
### END INIT INFO
diff --git a/sys/matahari.service.in b/sys/matahari.service.in
index 2a7a741..45628dc 100644
--- a/sys/matahari.service.in
+++ b/sys/matahari.service.in
@@ -4,7 +4,7 @@ After=syslog.target network.target matahari-broker.service
Requires=syslog.target network.target
[Install]
-WantedBy=multi-user.target
+#WantedBy=multi-user.target
[Service]
Type=simple
12 years, 1 month
Generating agent code from schema
by Radek Novacek
Hello folks,
I've been working on a proof-of-concept of the possibility to automatically
generate agent code (qmf and dbus parts of the agent) from schema.xml. In this
email I'll show you the progress in this feature as well as some changes I
propose to ease creation of new agents.
* Templates in python-cheetah *
Python-cheetah templating system is used for transforming schema.xml to agent
source code and header for the library (explanation will follow). Using this
really simplifies readability of the code. I tried to use XSLT first but the
transformation definition was a mess.
What the Cheetah does? <very simplified explanation> It takes template and
interprets all lines starting with '#' as python code and replace all
variables starting with '$' with their content.
* Generate library headers *
When the QMF/DBus part is autogenerated we need to exactly specify how it will
be glued together with the library. So header file for the library is
generated too and the library implements functions specified there. This way
compiler ensures that all methods are implemented and has expected prototypes.
Since part of the library (headers) are generated from schema, I've decided to
move all the agent-specific libraries from lib/ to agent-specific subdirectory
(like host/). It makes more sense to have the schema.xml and the library code
that implements functions based on the schema in same directory.
* Bonus features *
There is structure called Matahari (not sure if it shouldn't be renamed
somehow) that is passed to all of these methods. It allows some extra
features, like:
- No global variables
One can assign his own structure to private field of Matahari struct
(useful e.g. for sigar instance)
- Error messages
Error messages can be stored in Matahari struct and be passed via
transport method to caller (Qmf and DBus have exceptions for that)
- Asynchronous methods
There is callback method that can be used for async methods. Method in
library just returns MH_RES_ASYNC return code and then call callback item from
Matahari struct when the result is ready
- Easy to add new transport layer
Creation of transformation template is almost the only thing needed to be
done to add a new transport layer and it doesn't require to change agent
libraries.
* Issues *
- callback methods are not type safe (there is cast to generic function
pointer)
- emitting events are not type safe (now it uses variadic arguments)
- setting properties is not implemented - I think we need some standard way
how to set properties since QMF don't support setting the value to properties
directly
- one API incompatibility: QMF product for agents had a different letter-case
(Network vs. service) - needs to have same rules to be autogenerated ->
changed to always uppercase for first letter (same as class name in schema)
I've push the code to my GitHub repo:
https://github.com/rnovacek/matahari/commit/ca169438c51d9efcf9806816f01aa...
Any advice and suggestions are welcomed.
Radek Novacek
12 years, 1 month
[PATCH] Remove unused includes to avoid linking to libqpidcommon
by Jeff Peeler
Since libqpidcommon has an unstable ABI, remove its dependence so that Qpid
rebuilds do not affect Matahari.
Signed-off-by: Jeff Peeler <jpeeler(a)redhat.com>
---
src/lib/mh_agent.cpp | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/src/lib/mh_agent.cpp b/src/lib/mh_agent.cpp
index 83beb83..ee30108 100644
--- a/src/lib/mh_agent.cpp
+++ b/src/lib/mh_agent.cpp
@@ -34,9 +34,6 @@
#include <stdlib.h>
#include <cstdlib>
-#include <qpid/sys/Time.h>
-#include <qpid/agent/ManagementAgent.h>
-#include <qpid/client/ConnectionSettings.h>
#include <qmf/DataAddr.h>
#include <qmf/Schema.h>
#include <qmf/SchemaProperty.h>
@@ -58,8 +55,6 @@ extern "C" {
}
#endif
-using namespace qpid::management;
-using namespace qpid::client;
using namespace std;
typedef qpid::types::Variant::Map OptionsMap;
--
1.7.7.6
12 years, 1 month
[PATCH] build: Don't autogenerate man pages, use copies in source directory temporarily.
by Jeff Peeler
This adds a new cmake macro to handle installing man pages if one exists
in the source directory and adds a man page for every binary. The change
is temporary so that man pages are installed while autogeneration is not
working.
Once autogeneration of man pages is working again, all the CMakeLists
changes can be changed back with the exception of the broker agent which
will never be autogenerated (the new install_manpage macro could
stay too).
Signed-off-by: Jeff Peeler <jpeeler(a)redhat.com>
---
.gitignore | 1 +
src/.gitignore | 1 +
src/broker/CMakeLists.txt | 13 ++-
src/cmake/modules/MatahariMacros.cmake | 14 +++
src/dbus-bridge/CMakeLists.txt | 3 +-
src/dbus-bridge/matahari-qmf-dbus-bridged.8 | 79 ++++++++++++++
src/host/CMakeLists.txt | 3 +-
src/host/matahari-qmf-hostd.8 | 79 ++++++++++++++
src/network/CMakeLists.txt | 3 +-
src/network/matahari-qmf-networkd.8 | 79 ++++++++++++++
src/rpc/CMakeLists.txt | 3 +-
src/rpc/matahari-qmf-rpcd.8 | 79 ++++++++++++++
src/service/CMakeLists.txt | 6 +-
src/service/matahari-qmf-service-cli.8 | 133
+++++++++++++++++++++++
src/service/matahari-qmf-serviced.8 | 79 ++++++++++++++
src/sysconfig/CMakeLists.txt | 6 +-
src/sysconfig/matahari-qmf-sysconfig-consoled.8 | 79 ++++++++++++++
src/sysconfig/matahari-qmf-sysconfigd.8 | 79 ++++++++++++++
18 files changed, 725 insertions(+), 14 deletions(-)
create mode 100644 src/dbus-bridge/matahari-qmf-dbus-bridged.8
create mode 100644 src/host/matahari-qmf-hostd.8
create mode 100644 src/network/matahari-qmf-networkd.8
create mode 100644 src/rpc/matahari-qmf-rpcd.8
create mode 100644 src/service/matahari-qmf-service-cli.8
create mode 100644 src/service/matahari-qmf-serviced.8
create mode 100644 src/sysconfig/matahari-qmf-sysconfig-consoled.8
create mode 100644 src/sysconfig/matahari-qmf-sysconfigd.8
diff --git a/.gitignore b/.gitignore
index 33b2db7..14f8e32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,5 +17,6 @@ mock
*.orig
*.rej
*.rpm
+*.swp
tags
TAGS
diff --git a/src/.gitignore b/src/.gitignore
index 29b9456..0d284b3 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -4,6 +4,7 @@ config.h
include/matahari.h
qmf
matahari-*
+!matahari-*.8
*-dbus-glue.h
*-dbus-properties.h
org.matahariproject.xml
diff --git a/src/broker/CMakeLists.txt b/src/broker/CMakeLists.txt
index f5959c6..c688316 100644
--- a/src/broker/CMakeLists.txt
+++ b/src/broker/CMakeLists.txt
@@ -12,12 +12,13 @@ if(NOT WIN32)
install(TARGETS ${BROKER_DAEMON} DESTINATION sbin)
- SET(MAN_PAGE ${BROKER_DAEMON}.${AGENT_MAN_SECTION})
- install(CODE "execute_process(COMMAND gzip
- INPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${MAN_PAGE}
- OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${MAN_PAGE}.gz)")
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MAN_PAGE}.gz
- DESTINATION share/man/man${AGENT_MAN_SECTION})
+ #SET(MAN_PAGE ${BROKER_DAEMON}.${AGENT_MAN_SECTION})
+ #install(CODE "execute_process(COMMAND gzip
+ # INPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${MAN_PAGE}
+ # OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${MAN_PAGE}.gz)")
+ #install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MAN_PAGE}.gz
+ # DESTINATION share/man/man${AGENT_MAN_SECTION})
+ install_manpage(${BROKER_DAEMON} ${AGENT_MAN_SECTION})
configure_file(${CMAKE_SOURCE_DIR}/sys/matahari-broker.init.in
${CMAKE_CURRENT_BINARY_DIR}/matahari-broker.init
@ONLY)
diff --git a/src/cmake/modules/MatahariMacros.cmake
b/src/cmake/modules/MatahariMacros.cmake
index 615b010..de1f1ae 100644
--- a/src/cmake/modules/MatahariMacros.cmake
+++ b/src/cmake/modules/MatahariMacros.cmake
@@ -119,6 +119,20 @@ macro(create_manpage BINARY SECTION DESC)
endif(NOT WIN32)
endmacro(create_manpage)
+macro(install_manpage BINARY SECTION)
+ SET(MAN_PAGE_IN ${CMAKE_CURRENT_SOURCE_DIR}/${BINARY}.${SECTION})
+ SET(MAN_PAGE_OUT
${CMAKE_CURRENT_BINARY_DIR}/${BINARY}.${SECTION}.gz)
+
+ if(NOT EXISTS ${MAN_PAGE_OUT})
+ execute_process(COMMAND gzip INPUT_FILE ${MAN_PAGE_IN}
OUTPUT_FILE ${MAN_PAGE_OUT})
+ Message("Prepared ${BINARY} man page")
+ endif(NOT EXISTS ${MAN_PAGE_OUT})
+
+ if(NOT WIN32)
+ install(FILES ${MAN_PAGE_OUT} DESTINATION share/man/man
${SECTION})
+ endif(NOT WIN32)
+endmacro(install_manpage)
+
macro(create_service_scripts BASE)
if(NOT WIN32)
configure_file(${CMAKE_SOURCE_DIR}/sys/matahari.init.in
${CMAKE_CURRENT_BINARY_DIR}/matahari-${BASE})
diff --git a/src/dbus-bridge/CMakeLists.txt
b/src/dbus-bridge/CMakeLists.txt
index ca13086..fc28be4 100644
--- a/src/dbus-bridge/CMakeLists.txt
+++ b/src/dbus-bridge/CMakeLists.txt
@@ -11,7 +11,8 @@ if(WITH-QMF AND WITH-DBUS)
add_executable(${QMF_AGENT} ${BASE}.cpp dbusobject.cpp method.cpp
utils.cpp ${SCHEMA_SOURCES})
target_link_libraries(${QMF_AGENT} mcommon mcommon_qmf
${dbus-glib_LIBRARIES} ${libxml2_LIBRARIES})
- create_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION} ${AGENT_MAN_DESC})
+ #create_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION}
${AGENT_MAN_DESC})
+ install_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION})
create_service_scripts(${BASE})
install(TARGETS ${QMF_AGENT} DESTINATION sbin)
diff --git a/src/dbus-bridge/matahari-qmf-dbus-bridged.8
b/src/dbus-bridge/matahari-qmf-dbus-bridged.8
new file mode 100644
index 0000000..7be307a
--- /dev/null
+++ b/src/dbus-bridge/matahari-qmf-dbus-bridged.8
@@ -0,0 +1,79 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.6.
+.TH MATAHARI-DBUSBRIDGED "8" "March 2012" "matahari-DBusBridged
<options>" "System Administration Utilities"
+.SH NAME
+matahari-DBusBridged \- Part of the Matahari suite of remote agents
+.SH DESCRIPTION
+matahari\-DBusBridged <options>
+.SH OPTIONS
+.TP
+\fB\-h\fR | \fB\-\-help\fR
+print this help message.
+.TP
+\fB\-D\fR | \fB\-\-dns\-srv\fR
+interpret the value of \fB\-\-broker\fR as a domain name for DNS SRV
lookups
+.TP
+\fB\-P\fR | \fB\-\-password\fR
+password to use for authentication to the broker
+.TP
+\fB\-b\fR | \fB\-\-broker\fR
+specify broker host name
+.TP
+\fB\-d\fR | \fB\-\-daemon\fR
+run as a daemon
+.TP
+\fB\-n\fR | \fB\-\-ssl\-cert\-name\fR
+name of the certificate to use
+.TP
+\fB\-p\fR | \fB\-\-port\fR
+specify broker port
+.TP
+\fB\-r\fR | \fB\-\-reconnect\fR
+attempt to reconnect if the broker connection is lost
+.TP
+\fB\-s\fR | \fB\-\-service\fR
+service name to use for authentication to the broker
+.TP
+\fB\-t\fR | \fB\-\-use\-tls\fR
+Use TLS/SSL encryption
+.TP
+\fB\-u\fR | \fB\-\-username\fR
+username to use for authentication to the broker
+.TP
+\fB\-v\fR | \fB\-\-verbose\fR
+Increase the log level
+.TP
+\fB\-h\fR | \fB\-\-help\fR
+print this help message.
+.TP
+\fB\-D\fR | \fB\-\-dns\-srv\fR
+interpret the value of \fB\-\-broker\fR as a domain name for DNS SRV
lookups
+.TP
+\fB\-P\fR | \fB\-\-password\fR
+password to use for authentication to the broker
+.TP
+\fB\-b\fR | \fB\-\-broker\fR
+specify broker host name
+.TP
+\fB\-d\fR | \fB\-\-daemon\fR
+run as a daemon
+.TP
+\fB\-n\fR | \fB\-\-ssl\-cert\-name\fR
+name of the certificate to use
+.TP
+\fB\-p\fR | \fB\-\-port\fR
+specify broker port
+.TP
+\fB\-r\fR | \fB\-\-reconnect\fR
+attempt to reconnect if the broker connection is lost
+.TP
+\fB\-s\fR | \fB\-\-service\fR
+service name to use for authentication to the broker
+.TP
+\fB\-t\fR | \fB\-\-use\-tls\fR
+Use TLS/SSL encryption
+.TP
+\fB\-u\fR | \fB\-\-username\fR
+username to use for authentication to the broker
+.TP
+\fB\-v\fR | \fB\-\-verbose\fR
+Increase the log level
diff --git a/src/host/CMakeLists.txt b/src/host/CMakeLists.txt
index dd92d3f..2514e99 100644
--- a/src/host/CMakeLists.txt
+++ b/src/host/CMakeLists.txt
@@ -12,7 +12,8 @@ if(WITH-QMF)
add_executable(${QMF_AGENT} ${BASE}-qmf.cpp ${SCHEMA_SOURCES})
target_link_libraries(${QMF_AGENT} ${BASE_LIB} mcommon_qmf)
- create_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION} ${AGENT_MAN_DESC})
+ #create_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION}
${AGENT_MAN_DESC})
+ install_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION})
create_service_scripts(${BASE})
install(TARGETS ${QMF_AGENT} DESTINATION sbin)
diff --git a/src/host/matahari-qmf-hostd.8
b/src/host/matahari-qmf-hostd.8
new file mode 100644
index 0000000..f2b93e0
--- /dev/null
+++ b/src/host/matahari-qmf-hostd.8
@@ -0,0 +1,79 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.6.
+.TH MATAHARI-HOSTD "8" "March 2012" "matahari-hostd <options>" "System
Administration Utilities"
+.SH NAME
+matahari-hostd \- Part of the Matahari suite of remote agents
+.SH DESCRIPTION
+matahari\-hostd <options>
+.SH OPTIONS
+.TP
+\fB\-h\fR | \fB\-\-help\fR
+print this help message.
+.TP
+\fB\-D\fR | \fB\-\-dns\-srv\fR
+interpret the value of \fB\-\-broker\fR as a domain name for DNS SRV
lookups
+.TP
+\fB\-P\fR | \fB\-\-password\fR
+password to use for authentication to the broker
+.TP
+\fB\-b\fR | \fB\-\-broker\fR
+specify broker host name
+.TP
+\fB\-d\fR | \fB\-\-daemon\fR
+run as a daemon
+.TP
+\fB\-n\fR | \fB\-\-ssl\-cert\-name\fR
+name of the certificate to use
+.TP
+\fB\-p\fR | \fB\-\-port\fR
+specify broker port
+.TP
+\fB\-r\fR | \fB\-\-reconnect\fR
+attempt to reconnect if the broker connection is lost
+.TP
+\fB\-s\fR | \fB\-\-service\fR
+service name to use for authentication to the broker
+.TP
+\fB\-t\fR | \fB\-\-use\-tls\fR
+Use TLS/SSL encryption
+.TP
+\fB\-u\fR | \fB\-\-username\fR
+username to use for authentication to the broker
+.TP
+\fB\-v\fR | \fB\-\-verbose\fR
+Increase the log level
+.TP
+\fB\-h\fR | \fB\-\-help\fR
+print this help message.
+.TP
+\fB\-D\fR | \fB\-\-dns\-srv\fR
+interpret the value of \fB\-\-broker\fR as a domain name for DNS SRV
lookups
+.TP
+\fB\-P\fR | \fB\-\-password\fR
+password to use for authentication to the broker
+.TP
+\fB\-b\fR | \fB\-\-broker\fR
+specify broker host name
+.TP
+\fB\-d\fR | \fB\-\-daemon\fR
+run as a daemon
+.TP
+\fB\-n\fR | \fB\-\-ssl\-cert\-name\fR
+name of the certificate to use
+.TP
+\fB\-p\fR | \fB\-\-port\fR
+specify broker port
+.TP
+\fB\-r\fR | \fB\-\-reconnect\fR
+attempt to reconnect if the broker connection is lost
+.TP
+\fB\-s\fR | \fB\-\-service\fR
+service name to use for authentication to the broker
+.TP
+\fB\-t\fR | \fB\-\-use\-tls\fR
+Use TLS/SSL encryption
+.TP
+\fB\-u\fR | \fB\-\-username\fR
+username to use for authentication to the broker
+.TP
+\fB\-v\fR | \fB\-\-verbose\fR
+Increase the log level
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 8f4313f..6b1809b 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -12,7 +12,8 @@ if(WITH-QMF)
add_executable(${QMF_AGENT} ${BASE}-qmf.cpp ${SCHEMA_SOURCES})
target_link_libraries(${QMF_AGENT} ${BASE_LIB} mcommon_qmf)
- create_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION} ${AGENT_MAN_DESC})
+ #create_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION}
${AGENT_MAN_DESC})
+ install_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION})
create_service_scripts(${BASE})
install(TARGETS ${QMF_AGENT} DESTINATION sbin)
diff --git a/src/network/matahari-qmf-networkd.8
b/src/network/matahari-qmf-networkd.8
new file mode 100644
index 0000000..6bd5206
--- /dev/null
+++ b/src/network/matahari-qmf-networkd.8
@@ -0,0 +1,79 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.6.
+.TH MATAHARI-NETWORKD "8" "March 2012" "matahari-Networkd <options>"
"System Administration Utilities"
+.SH NAME
+matahari-Networkd \- Part of the Matahari suite of remote agents
+.SH DESCRIPTION
+matahari\-Networkd <options>
+.SH OPTIONS
+.TP
+\fB\-h\fR | \fB\-\-help\fR
+print this help message.
+.TP
+\fB\-D\fR | \fB\-\-dns\-srv\fR
+interpret the value of \fB\-\-broker\fR as a domain name for DNS SRV
lookups
+.TP
+\fB\-P\fR | \fB\-\-password\fR
+password to use for authentication to the broker
+.TP
+\fB\-b\fR | \fB\-\-broker\fR
+specify broker host name
+.TP
+\fB\-d\fR | \fB\-\-daemon\fR
+run as a daemon
+.TP
+\fB\-n\fR | \fB\-\-ssl\-cert\-name\fR
+name of the certificate to use
+.TP
+\fB\-p\fR | \fB\-\-port\fR
+specify broker port
+.TP
+\fB\-r\fR | \fB\-\-reconnect\fR
+attempt to reconnect if the broker connection is lost
+.TP
+\fB\-s\fR | \fB\-\-service\fR
+service name to use for authentication to the broker
+.TP
+\fB\-t\fR | \fB\-\-use\-tls\fR
+Use TLS/SSL encryption
+.TP
+\fB\-u\fR | \fB\-\-username\fR
+username to use for authentication to the broker
+.TP
+\fB\-v\fR | \fB\-\-verbose\fR
+Increase the log level
+.TP
+\fB\-h\fR | \fB\-\-help\fR
+print this help message.
+.TP
+\fB\-D\fR | \fB\-\-dns\-srv\fR
+interpret the value of \fB\-\-broker\fR as a domain name for DNS SRV
lookups
+.TP
+\fB\-P\fR | \fB\-\-password\fR
+password to use for authentication to the broker
+.TP
+\fB\-b\fR | \fB\-\-broker\fR
+specify broker host name
+.TP
+\fB\-d\fR | \fB\-\-daemon\fR
+run as a daemon
+.TP
+\fB\-n\fR | \fB\-\-ssl\-cert\-name\fR
+name of the certificate to use
+.TP
+\fB\-p\fR | \fB\-\-port\fR
+specify broker port
+.TP
+\fB\-r\fR | \fB\-\-reconnect\fR
+attempt to reconnect if the broker connection is lost
+.TP
+\fB\-s\fR | \fB\-\-service\fR
+service name to use for authentication to the broker
+.TP
+\fB\-t\fR | \fB\-\-use\-tls\fR
+Use TLS/SSL encryption
+.TP
+\fB\-u\fR | \fB\-\-username\fR
+username to use for authentication to the broker
+.TP
+\fB\-v\fR | \fB\-\-verbose\fR
+Increase the log level
diff --git a/src/rpc/CMakeLists.txt b/src/rpc/CMakeLists.txt
index f5595fb..40c37dd 100644
--- a/src/rpc/CMakeLists.txt
+++ b/src/rpc/CMakeLists.txt
@@ -12,7 +12,8 @@ if(NOT WIN32)
add_executable(${QMF_AGENT} ${BASE}-qmf.cpp ${SCHEMA_SOURCES})
target_link_libraries(${QMF_AGENT} ${BASE_LIB} mcommon_qmf)
- create_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION} ${AGENT_MAN_DESC})
+ #create_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION}
${AGENT_MAN_DESC})
+ install_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION})
create_service_scripts(${BASE})
install(TARGETS ${QMF_AGENT} DESTINATION sbin)
diff --git a/src/rpc/matahari-qmf-rpcd.8 b/src/rpc/matahari-qmf-rpcd.8
new file mode 100644
index 0000000..6b320b6
--- /dev/null
+++ b/src/rpc/matahari-qmf-rpcd.8
@@ -0,0 +1,79 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.6.
+.TH MATAHARI-RPCD "8" "March 2012" "matahari-rpcd <options>" "System
Administration Utilities"
+.SH NAME
+matahari-rpcd \- Part of the Matahari suite of remote agents
+.SH DESCRIPTION
+matahari\-rpcd <options>
+.SH OPTIONS
+.TP
+\fB\-h\fR | \fB\-\-help\fR
+print this help message.
+.TP
+\fB\-D\fR | \fB\-\-dns\-srv\fR
+interpret the value of \fB\-\-broker\fR as a domain name for DNS SRV
lookups
+.TP
+\fB\-P\fR | \fB\-\-password\fR
+password to use for authentication to the broker
+.TP
+\fB\-b\fR | \fB\-\-broker\fR
+specify broker host name
+.TP
+\fB\-d\fR | \fB\-\-daemon\fR
+run as a daemon
+.TP
+\fB\-n\fR | \fB\-\-ssl\-cert\-name\fR
+name of the certificate to use
+.TP
+\fB\-p\fR | \fB\-\-port\fR
+specify broker port
+.TP
+\fB\-r\fR | \fB\-\-reconnect\fR
+attempt to reconnect if the broker connection is lost
+.TP
+\fB\-s\fR | \fB\-\-service\fR
+service name to use for authentication to the broker
+.TP
+\fB\-t\fR | \fB\-\-use\-tls\fR
+Use TLS/SSL encryption
+.TP
+\fB\-u\fR | \fB\-\-username\fR
+username to use for authentication to the broker
+.TP
+\fB\-v\fR | \fB\-\-verbose\fR
+Increase the log level
+.TP
+\fB\-h\fR | \fB\-\-help\fR
+print this help message.
+.TP
+\fB\-D\fR | \fB\-\-dns\-srv\fR
+interpret the value of \fB\-\-broker\fR as a domain name for DNS SRV
lookups
+.TP
+\fB\-P\fR | \fB\-\-password\fR
+password to use for authentication to the broker
+.TP
+\fB\-b\fR | \fB\-\-broker\fR
+specify broker host name
+.TP
+\fB\-d\fR | \fB\-\-daemon\fR
+run as a daemon
+.TP
+\fB\-n\fR | \fB\-\-ssl\-cert\-name\fR
+name of the certificate to use
+.TP
+\fB\-p\fR | \fB\-\-port\fR
+specify broker port
+.TP
+\fB\-r\fR | \fB\-\-reconnect\fR
+attempt to reconnect if the broker connection is lost
+.TP
+\fB\-s\fR | \fB\-\-service\fR
+service name to use for authentication to the broker
+.TP
+\fB\-t\fR | \fB\-\-use\-tls\fR
+Use TLS/SSL encryption
+.TP
+\fB\-u\fR | \fB\-\-username\fR
+username to use for authentication to the broker
+.TP
+\fB\-v\fR | \fB\-\-verbose\fR
+Increase the log level
diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index 586ed68..ae1bc31 100644
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -16,8 +16,10 @@ if(WITH-QMF)
add_executable(${QMF_CONSOLE} ${BASE}-qmf-console.cpp)
target_link_libraries(${QMF_CONSOLE} mcommon_qmf)
- create_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION} ${AGENT_MAN_DESC})
- create_manpage(${QMF_CONSOLE} ${CONSOLE_MAN_SECTION}
${CONSOLE_MAN_DESC})
+ #create_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION}
${AGENT_MAN_DESC})
+ #create_manpage(${QMF_CONSOLE} ${CONSOLE_MAN_SECTION}
${CONSOLE_MAN_DESC})
+ install_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION})
+ install_manpage(${QMF_CONSOLE} ${CONSOLE_MAN_SECTION})
create_service_scripts(${BASE})
install(TARGETS ${QMF_AGENT} DESTINATION sbin)
diff --git a/src/service/matahari-qmf-service-cli.8
b/src/service/matahari-qmf-service-cli.8
new file mode 100644
index 0000000..93443f9
--- /dev/null
+++ b/src/service/matahari-qmf-service-cli.8
@@ -0,0 +1,133 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.6.
+.TH MATAHARI-QMF-SERVICE-CLID "8" "March 2012"
"matahari-qmf-service-clid <options>" "System Administration Utilities"
+.SH NAME
+matahari-qmf-service-clid \- Console for the Matahari suite of remote
agents
+.SH DESCRIPTION
+matahari\-qmf\-service\-clid <options>
+.SH OPTIONS
+.TP
+\fB\-h\fR | \fB\-\-help\fR
+print this help message.
+.TP
+\fB\-A\fR | \fB\-\-agent\fR
+(Resources API only)
+.TP
+\fB\-D\fR | \fB\-\-dns\-srv\fR
+interpret the value of \fB\-\-broker\fR as a domain name for DNS SRV
lookups
+.TP
+\fB\-H\fR | \fB\-\-host\-dns\fR
+Host DNS name
+.TP
+\fB\-J\fR | \fB\-\-provider\fR
+(Resources API only)
+.TP
+\fB\-N\fR | \fB\-\-name\fR
+Name of a resource
+.TP
+\fB\-P\fR | \fB\-\-password\fR
+password to use for authentication to the broker
+.TP
+\fB\-S\fR | \fB\-\-standard\fR
+lsb|ocf|windows (Resources API only)
+.TP
+\fB\-T\fR | \fB\-\-api\-type\fR
+Resources|Services
+.TP
+\fB\-U\fR | \fB\-\-host\-uuid\fR
+Host UUID
+.TP
+\fB\-a\fR | \fB\-\-action\fR
+Action to perform
+.TP
+\fB\-b\fR | \fB\-\-broker\fR
+specify broker host name
+.TP
+\fB\-i\fR | \fB\-\-interval\fR
+(Resources API only) Time, in milliseconds, in between recurring
executions of this action.
+.TP
+\fB\-n\fR | \fB\-\-ssl\-cert\-name\fR
+name of the certificate to use
+.TP
+\fB\-o\fR | \fB\-\-option\fR
+Option to pass to the resource script (Resources API only)
+.TP
+\fB\-p\fR | \fB\-\-port\fR
+specify broker port
+.TP
+\fB\-r\fR | \fB\-\-reconnect\fR
+attempt to reconnect if the broker connection is lost
+.TP
+\fB\-s\fR | \fB\-\-service\fR
+service name to use for authentication to the broker
+.TP
+\fB\-t\fR | \fB\-\-use\-tls\fR
+Use TLS/SSL encryption
+.TP
+\fB\-u\fR | \fB\-\-username\fR
+username to use for authentication to the broker
+.TP
+\fB\-v\fR | \fB\-\-verbose\fR
+Increase the log level
+.TP
+\fB\-h\fR | \fB\-\-help\fR
+print this help message.
+.TP
+\fB\-A\fR | \fB\-\-agent\fR
+(Resources API only)
+.TP
+\fB\-D\fR | \fB\-\-dns\-srv\fR
+interpret the value of \fB\-\-broker\fR as a domain name for DNS SRV
lookups
+.TP
+\fB\-H\fR | \fB\-\-host\-dns\fR
+Host DNS name
+.TP
+\fB\-J\fR | \fB\-\-provider\fR
+(Resources API only)
+.TP
+\fB\-N\fR | \fB\-\-name\fR
+Name of a resource
+.TP
+\fB\-P\fR | \fB\-\-password\fR
+password to use for authentication to the broker
+.TP
+\fB\-S\fR | \fB\-\-standard\fR
+lsb|ocf|windows (Resources API only)
+.TP
+\fB\-T\fR | \fB\-\-api\-type\fR
+Resources|Services
+.TP
+\fB\-U\fR | \fB\-\-host\-uuid\fR
+Host UUID
+.TP
+\fB\-a\fR | \fB\-\-action\fR
+Action to perform
+.TP
+\fB\-b\fR | \fB\-\-broker\fR
+specify broker host name
+.TP
+\fB\-i\fR | \fB\-\-interval\fR
+(Resources API only) Time, in milliseconds, in between recurring
executions of this action.
+.TP
+\fB\-n\fR | \fB\-\-ssl\-cert\-name\fR
+name of the certificate to use
+.TP
+\fB\-o\fR | \fB\-\-option\fR
+Option to pass to the resource script (Resources API only)
+.TP
+\fB\-p\fR | \fB\-\-port\fR
+specify broker port
+.TP
+\fB\-r\fR | \fB\-\-reconnect\fR
+attempt to reconnect if the broker connection is lost
+.TP
+\fB\-s\fR | \fB\-\-service\fR
+service name to use for authentication to the broker
+.TP
+\fB\-t\fR | \fB\-\-use\-tls\fR
+Use TLS/SSL encryption
+.TP
+\fB\-u\fR | \fB\-\-username\fR
+username to use for authentication to the broker
+.TP
+\fB\-v\fR | \fB\-\-verbose\fR
+Increase the log level
diff --git a/src/service/matahari-qmf-serviced.8
b/src/service/matahari-qmf-serviced.8
new file mode 100644
index 0000000..66cab07
--- /dev/null
+++ b/src/service/matahari-qmf-serviced.8
@@ -0,0 +1,79 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.6.
+.TH MATAHARI-SERVICED "8" "March 2012" "matahari-serviced <options>"
"System Administration Utilities"
+.SH NAME
+matahari-serviced \- Part of the Matahari suite of remote agents
+.SH DESCRIPTION
+matahari\-serviced <options>
+.SH OPTIONS
+.TP
+\fB\-h\fR | \fB\-\-help\fR
+print this help message.
+.TP
+\fB\-D\fR | \fB\-\-dns\-srv\fR
+interpret the value of \fB\-\-broker\fR as a domain name for DNS SRV
lookups
+.TP
+\fB\-P\fR | \fB\-\-password\fR
+password to use for authentication to the broker
+.TP
+\fB\-b\fR | \fB\-\-broker\fR
+specify broker host name
+.TP
+\fB\-d\fR | \fB\-\-daemon\fR
+run as a daemon
+.TP
+\fB\-n\fR | \fB\-\-ssl\-cert\-name\fR
+name of the certificate to use
+.TP
+\fB\-p\fR | \fB\-\-port\fR
+specify broker port
+.TP
+\fB\-r\fR | \fB\-\-reconnect\fR
+attempt to reconnect if the broker connection is lost
+.TP
+\fB\-s\fR | \fB\-\-service\fR
+service name to use for authentication to the broker
+.TP
+\fB\-t\fR | \fB\-\-use\-tls\fR
+Use TLS/SSL encryption
+.TP
+\fB\-u\fR | \fB\-\-username\fR
+username to use for authentication to the broker
+.TP
+\fB\-v\fR | \fB\-\-verbose\fR
+Increase the log level
+.TP
+\fB\-h\fR | \fB\-\-help\fR
+print this help message.
+.TP
+\fB\-D\fR | \fB\-\-dns\-srv\fR
+interpret the value of \fB\-\-broker\fR as a domain name for DNS SRV
lookups
+.TP
+\fB\-P\fR | \fB\-\-password\fR
+password to use for authentication to the broker
+.TP
+\fB\-b\fR | \fB\-\-broker\fR
+specify broker host name
+.TP
+\fB\-d\fR | \fB\-\-daemon\fR
+run as a daemon
+.TP
+\fB\-n\fR | \fB\-\-ssl\-cert\-name\fR
+name of the certificate to use
+.TP
+\fB\-p\fR | \fB\-\-port\fR
+specify broker port
+.TP
+\fB\-r\fR | \fB\-\-reconnect\fR
+attempt to reconnect if the broker connection is lost
+.TP
+\fB\-s\fR | \fB\-\-service\fR
+service name to use for authentication to the broker
+.TP
+\fB\-t\fR | \fB\-\-use\-tls\fR
+Use TLS/SSL encryption
+.TP
+\fB\-u\fR | \fB\-\-username\fR
+username to use for authentication to the broker
+.TP
+\fB\-v\fR | \fB\-\-verbose\fR
+Increase the log level
diff --git a/src/sysconfig/CMakeLists.txt b/src/sysconfig/CMakeLists.txt
index 9a491d1..945fa80 100644
--- a/src/sysconfig/CMakeLists.txt
+++ b/src/sysconfig/CMakeLists.txt
@@ -16,8 +16,10 @@ if(WITH-QMF)
target_link_libraries(${QMF_AGENT} ${BASE_LIB} mcommon_qmf)
target_link_libraries(${QMF_CONSOLE} mcommon_qmf)
- create_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION} ${AGENT_MAN_DESC})
- create_manpage(${QMF_CONSOLE} ${CONSOLE_MAN_SECTION}
${CONSOLE_MAN_DESC})
+ #create_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION}
${AGENT_MAN_DESC})
+ #create_manpage(${QMF_CONSOLE} ${CONSOLE_MAN_SECTION}
${CONSOLE_MAN_DESC})
+ install_manpage(${QMF_AGENT} ${AGENT_MAN_SECTION})
+ install_manpage(${QMF_CONSOLE} ${CONSOLE_MAN_SECTION})
create_service_scripts(${BASE})
set(BASE_SUB "-console")
diff --git a/src/sysconfig/matahari-qmf-sysconfig-consoled.8
b/src/sysconfig/matahari-qmf-sysconfig-consoled.8
new file mode 100644
index 0000000..aedcb4b
--- /dev/null
+++ b/src/sysconfig/matahari-qmf-sysconfig-consoled.8
@@ -0,0 +1,79 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.6.
+.TH MATAHARI-SYSCONFIG-CONSOLED "8" "March 2012"
"matahari-sysconfig-consoled <options>" "System Administration
Utilities"
+.SH NAME
+matahari-sysconfig-consoled \- Console for the Matahari suite of remote
agents
+.SH DESCRIPTION
+matahari\-sysconfig\-consoled <options>
+.SH OPTIONS
+.TP
+\fB\-h\fR | \fB\-\-help\fR
+print this help message.
+.TP
+\fB\-D\fR | \fB\-\-dns\-srv\fR
+interpret the value of \fB\-\-broker\fR as a domain name for DNS SRV
lookups
+.TP
+\fB\-P\fR | \fB\-\-password\fR
+password to use for authentication to the broker
+.TP
+\fB\-b\fR | \fB\-\-broker\fR
+specify broker host name
+.TP
+\fB\-d\fR | \fB\-\-daemon\fR
+run as a daemon
+.TP
+\fB\-n\fR | \fB\-\-ssl\-cert\-name\fR
+name of the certificate to use
+.TP
+\fB\-p\fR | \fB\-\-port\fR
+specify broker port
+.TP
+\fB\-r\fR | \fB\-\-reconnect\fR
+attempt to reconnect if the broker connection is lost
+.TP
+\fB\-s\fR | \fB\-\-service\fR
+service name to use for authentication to the broker
+.TP
+\fB\-t\fR | \fB\-\-use\-tls\fR
+Use TLS/SSL encryption
+.TP
+\fB\-u\fR | \fB\-\-username\fR
+username to use for authentication to the broker
+.TP
+\fB\-v\fR | \fB\-\-verbose\fR
+Increase the log level
+.TP
+\fB\-h\fR | \fB\-\-help\fR
+print this help message.
+.TP
+\fB\-D\fR | \fB\-\-dns\-srv\fR
+interpret the value of \fB\-\-broker\fR as a domain name for DNS SRV
lookups
+.TP
+\fB\-P\fR | \fB\-\-password\fR
+password to use for authentication to the broker
+.TP
+\fB\-b\fR | \fB\-\-broker\fR
+specify broker host name
+.TP
+\fB\-d\fR | \fB\-\-daemon\fR
+run as a daemon
+.TP
+\fB\-n\fR | \fB\-\-ssl\-cert\-name\fR
+name of the certificate to use
+.TP
+\fB\-p\fR | \fB\-\-port\fR
+specify broker port
+.TP
+\fB\-r\fR | \fB\-\-reconnect\fR
+attempt to reconnect if the broker connection is lost
+.TP
+\fB\-s\fR | \fB\-\-service\fR
+service name to use for authentication to the broker
+.TP
+\fB\-t\fR | \fB\-\-use\-tls\fR
+Use TLS/SSL encryption
+.TP
+\fB\-u\fR | \fB\-\-username\fR
+username to use for authentication to the broker
+.TP
+\fB\-v\fR | \fB\-\-verbose\fR
+Increase the log level
diff --git a/src/sysconfig/matahari-qmf-sysconfigd.8
b/src/sysconfig/matahari-qmf-sysconfigd.8
new file mode 100644
index 0000000..f8b36e1
--- /dev/null
+++ b/src/sysconfig/matahari-qmf-sysconfigd.8
@@ -0,0 +1,79 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.6.
+.TH MATAHARI-SYSCONFIGD "8" "March 2012" "matahari-Sysconfigd
<options>" "System Administration Utilities"
+.SH NAME
+matahari-Sysconfigd \- Part of the Matahari suite of remote agents
+.SH DESCRIPTION
+matahari\-Sysconfigd <options>
+.SH OPTIONS
+.TP
+\fB\-h\fR | \fB\-\-help\fR
+print this help message.
+.TP
+\fB\-D\fR | \fB\-\-dns\-srv\fR
+interpret the value of \fB\-\-broker\fR as a domain name for DNS SRV
lookups
+.TP
+\fB\-P\fR | \fB\-\-password\fR
+password to use for authentication to the broker
+.TP
+\fB\-b\fR | \fB\-\-broker\fR
+specify broker host name
+.TP
+\fB\-d\fR | \fB\-\-daemon\fR
+run as a daemon
+.TP
+\fB\-n\fR | \fB\-\-ssl\-cert\-name\fR
+name of the certificate to use
+.TP
+\fB\-p\fR | \fB\-\-port\fR
+specify broker port
+.TP
+\fB\-r\fR | \fB\-\-reconnect\fR
+attempt to reconnect if the broker connection is lost
+.TP
+\fB\-s\fR | \fB\-\-service\fR
+service name to use for authentication to the broker
+.TP
+\fB\-t\fR | \fB\-\-use\-tls\fR
+Use TLS/SSL encryption
+.TP
+\fB\-u\fR | \fB\-\-username\fR
+username to use for authentication to the broker
+.TP
+\fB\-v\fR | \fB\-\-verbose\fR
+Increase the log level
+.TP
+\fB\-h\fR | \fB\-\-help\fR
+print this help message.
+.TP
+\fB\-D\fR | \fB\-\-dns\-srv\fR
+interpret the value of \fB\-\-broker\fR as a domain name for DNS SRV
lookups
+.TP
+\fB\-P\fR | \fB\-\-password\fR
+password to use for authentication to the broker
+.TP
+\fB\-b\fR | \fB\-\-broker\fR
+specify broker host name
+.TP
+\fB\-d\fR | \fB\-\-daemon\fR
+run as a daemon
+.TP
+\fB\-n\fR | \fB\-\-ssl\-cert\-name\fR
+name of the certificate to use
+.TP
+\fB\-p\fR | \fB\-\-port\fR
+specify broker port
+.TP
+\fB\-r\fR | \fB\-\-reconnect\fR
+attempt to reconnect if the broker connection is lost
+.TP
+\fB\-s\fR | \fB\-\-service\fR
+service name to use for authentication to the broker
+.TP
+\fB\-t\fR | \fB\-\-use\-tls\fR
+Use TLS/SSL encryption
+.TP
+\fB\-u\fR | \fB\-\-username\fR
+username to use for authentication to the broker
+.TP
+\fB\-v\fR | \fB\-\-verbose\fR
+Increase the log level
--
1.7.7.6
12 years, 1 month
[PATCH] Build: Handle differing locations of systemd unitdir
by Zane Bitter
In Fedora 17 (and, presumably, later), the correct location for systemd
unit files depends on the build prefix (i.e. it will normally be under
/usr), whereas in Fedora 15/16 it did not. So pass the correct location
from the spec file, and only fall back to the default if it is not
specified.
Signed-off-by: Zane Bitter <zbitter(a)redhat.com>
---
CMakeLists.txt | 1 +
matahari.spec.in | 2 +-
src/CMakeLists.txt | 3 ---
sys/CMakeLists.txt | 2 --
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a00c47..7b7475b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,7 @@ inherit_value(QPID_PATH "C:/Program Files/Apache/qpid-0.6")
inherit_value(localstatedir "/var")
inherit_value(sysconfdir "${SYSCONF_INSTALL_DIR}")
inherit_value(initdir "${SYSCONF_INSTALL_DIR}/init.d")
+inherit_value(systemdunitdir "/lib/systemd/system")
# Add sub-directories
add_subdirectory(src)
diff --git a/matahari.spec.in b/matahari.spec.in
index 6180621..6beaee5 100644
--- a/matahari.spec.in
+++ b/matahari.spec.in
@@ -292,7 +292,7 @@ QMF console for monitoring various agents
%setup -q -n matahari-matahari-%{upstream_version}
%build
-%{cmake} -DCMAKE_BUILD_TYPE=RelWithDebInfo %{!?with_qmf: -DWITH-QMF:BOOL=OFF} %{!?with_dbus: -DWITH-DBUS:BOOL=OFF} -Dinitdir=%{_initddir} -Dsysconfdir=%{_sysconfdir} .
+%{cmake} -DCMAKE_BUILD_TYPE=RelWithDebInfo %{!?with_qmf: -DWITH-QMF:BOOL=OFF} %{!?with_dbus: -DWITH-DBUS:BOOL=OFF} -Dinitdir=%{_initddir} -Dsysconfdir=%{_sysconfdir} -Dsystemdunitdir=%{_unitdir} .
make -f Makefile %{?_smp_mflags}
%if %{defined run_unit_tests}
cd src/tests && ctest -V
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b57393..98aa5bf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -68,9 +68,6 @@ check_function_exists (time HAVE_TIME)
## Modules
# systemd
pkg_check_modules(systemd systemd)
-if(systemd_FOUND)
- set(systemdunitdir "/lib/systemd/system")
-endif(systemd_FOUND)
# pcre
pkg_check_modules(pcre REQUIRED libpcre)
diff --git a/sys/CMakeLists.txt b/sys/CMakeLists.txt
index 2cfba1c..2e2f575 100644
--- a/sys/CMakeLists.txt
+++ b/sys/CMakeLists.txt
@@ -77,8 +77,6 @@ include(FindPkgConfig)
pkg_check_modules(systemd systemd)
if(systemd_FOUND)
- set(systemdunitdir "/lib/systemd/system")
-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/matahari-vios-proxy-host.service.in
${CMAKE_CURRENT_BINARY_DIR}/matahari-vios-proxy-host.service)
12 years, 1 month
[PATCH] Spec: Package QMF/D-Bus Bridge agent
by Zane Bitter
Signed-off-by: Zane Bitter <zbitter(a)redhat.com>
---
matahari.spec.in | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/matahari.spec.in b/matahari.spec.in
index d965e24..6180621 100644
--- a/matahari.spec.in
+++ b/matahari.spec.in
@@ -178,6 +178,19 @@ Requires: %{name}-python = %{version}-%{release}
%description shell
Interactive shell for accessing Matahari agents
+%package dbus-bridge
+License: GPLv2+
+Summary: QMF agent that bridges to D-Bus
+Group: Applications/System
+Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-agent-lib = %{version}-%{release}
+Requires(post): chkconfig
+Requires(preun):chkconfig
+Requires(preun):initscripts
+
+%description dbus-bridge
+QMF agent for interacting with D-Bus objects on the system
+
%package host
License: GPLv2+
Summary: QMF agent for remote hosts
@@ -292,6 +305,7 @@ make DESTDIR=%{buildroot} -f Makefile install
%if %{systemd}
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-service
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-network
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-dbus-bridge
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-host
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-rpc
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-sysconfig
@@ -310,6 +324,28 @@ rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-vios-proxy-guest
/sbin/ldconfig
%if %{with qmf}
+#== D-Bus Bridge
+
+%post dbus-bridge
+%if %{systemd}
+systemctl --system daemon-reload
+%else
+/sbin/chkconfig --add matahari-dbus-bridge
+%endif
+
+%preun dbus-bridge
+if [ $1 = 0 ]; then
+ /sbin/service matahari-dbus-bridge stop >/dev/null 2>&1 || :
+%if !%{systemd}
+ chkconfig --del matahari-dbus-bridge
+%endif
+fi
+
+%postun dbus-bridge
+if [ "$1" -ge "1" ]; then
+ /sbin/service matahari-dbus-bridge condrestart >/dev/null 2>&1 || :
+fi
+
#== Host
%post host
@@ -544,6 +580,22 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%{python_sitelib}/matahari/shell/interpreter/*.pyc
%{python_sitelib}/matahari/shell/interpreter/*.pyo
+%files dbus-bridge
+%defattr(644, root, root, 755)
+%doc AUTHORS COPYING
+
+%if %{systemd}
+%{_unitdir}/matahari-dbus-bridge.service
+%endif
+
+%if %{with qmf}
+%if !%{systemd}
+%attr(755, root, root) %{_initddir}/matahari-dbus-bridge
+%endif
+%attr(755, root, root) %{_sbindir}/matahari-qmf-dbus-bridged
+%{_mandir}/man8/matahari-qmf-dbus-bridged.8*
+%endif
+
%files network
%defattr(644, root, root, 755)
%doc AUTHORS COPYING
12 years, 1 month
[PATCH] Remove unnecessary condrestarts. (rhbz#752325)
by Russell Bryant
Remove some unnecessary condrestarts in %post. The bug was actually
complaining that Matahari updates were not silent. The output was
showing the services getting restarted. These lines were the culprit
and they shouldn't be there anyway. On an upgrade, they will get
restarted in the %postun scripts.
Signed-off-by: Russell Bryant <rbryant(a)redhat.com>
---
matahari.spec.in | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/matahari.spec.in b/matahari.spec.in
index 921f462..8707e9f 100644
--- a/matahari.spec.in
+++ b/matahari.spec.in
@@ -317,7 +317,6 @@ systemctl --system daemon-reload
%else
/sbin/chkconfig --add matahari-host
%endif
-/sbin/service matahari-host condrestart
%preun host
if [ $1 = 0 ]; then
@@ -340,7 +339,6 @@ systemctl --system daemon-reload
%else
/sbin/chkconfig --add matahari-network
%endif
-/sbin/service matahari-network condrestart
%preun network
if [ $1 = 0 ]; then
@@ -363,7 +361,6 @@ systemctl --system daemon-reload
%else
/sbin/chkconfig --add matahari-rpc
%endif
-/sbin/service matahari-rpc condrestart
%preun rpc
if [ $1 = 0 ]; then
@@ -386,7 +383,6 @@ systemctl --system daemon-reload
%else
/sbin/chkconfig --add matahari-service
%endif
-/sbin/service matahari-service condrestart
%preun service
if [ $1 = 0 ]; then
@@ -409,7 +405,6 @@ systemctl --system daemon-reload
%else
/sbin/chkconfig --add matahari-sysconfig
%endif
-/sbin/service matahari-sysconfig condrestart
%preun sysconfig
if [ $1 = 0 ]; then
@@ -432,7 +427,6 @@ systemctl --system daemon-reload
%else
/sbin/chkconfig --add matahari-broker
%endif
-/sbin/service matahari-broker condrestart
%preun broker
if [ $1 = 0 ]; then
@@ -452,7 +446,6 @@ fi
%if %{systemd}
systemctl --system daemon-reload
%endif
-/sbin/service matahari-vios-proxy-host condrestart
%preun vios-proxy-host
if [ $1 = 0 ]; then
@@ -472,7 +465,6 @@ fi
%if %{systemd}
systemctl --system daemon-reload
%endif
-/sbin/service matahari-vios-proxy-guest condrestart
%preun vios-proxy-guest
if [ $1 = 0 ]; then
--
1.7.7.6
12 years, 2 months