From 5f2b018e42543e030082730afc7e87d032135794 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 18 Mar 2013 09:37:46 +0000 Subject: [PATCH] Add an example for the ActiveMQ connector. Remove useless README. --- sysutils/mcollective/Makefile | 8 ++--- .../patches/patch-etc_client_cfg_dist | 34 +++++++++++++++++++ .../patches/patch-etc_server_cfg_dist | 34 +++++++++++++++++++ sysutils/mcollective/pkg/PLIST | 7 ++-- sysutils/mcollective/pkg/README | 23 ------------- 5 files changed, 74 insertions(+), 32 deletions(-) create mode 100644 sysutils/mcollective/patches/patch-etc_client_cfg_dist create mode 100644 sysutils/mcollective/patches/patch-etc_server_cfg_dist delete mode 100644 sysutils/mcollective/pkg/README diff --git a/sysutils/mcollective/Makefile b/sysutils/mcollective/Makefile index aab002d7717..27d4a06dc5e 100644 --- a/sysutils/mcollective/Makefile +++ b/sysutils/mcollective/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.6 2013/03/14 07:58:08 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.7 2013/03/18 09:37:46 ajacoutot Exp $ COMMENT= framework for server orchestration/parallel job execution DISTNAME= mcollective-2.3.0 EXTRACT_SUFX= .tgz -REVISION= 1 +REVISION= 2 CATEGORIES= sysutils @@ -34,9 +34,7 @@ MODRUBY_ADJ_FILES=mco mcollectived mc-call-agent MAKE_FILE= ext/Makefile pre-configure: - ${SUBST_CMD} ${WRKSRC}/ext/Makefile - perl -pi -e 's,/etc,${SYSCONFDIR},g;' \ - -e 's,/usr/libexec,${TRUEPREFIX}/libexec,g' \ + ${SUBST_CMD} ${WRKSRC}/ext/Makefile \ ${WRKSRC}/etc/server.cfg.dist \ ${WRKSRC}/etc/client.cfg.dist \ diff --git a/sysutils/mcollective/patches/patch-etc_client_cfg_dist b/sysutils/mcollective/patches/patch-etc_client_cfg_dist new file mode 100644 index 00000000000..bf3a830c138 --- /dev/null +++ b/sysutils/mcollective/patches/patch-etc_client_cfg_dist @@ -0,0 +1,34 @@ +$OpenBSD: patch-etc_client_cfg_dist,v 1.4 2013/03/18 09:37:46 ajacoutot Exp $ +--- etc/client.cfg.dist.orig Mon Mar 18 10:24:07 2013 ++++ etc/client.cfg.dist Mon Mar 18 10:24:59 2013 +@@ -1,7 +1,7 @@ + topicprefix = /topic/ + main_collective = mcollective + collectives = mcollective +-libdir = /usr/libexec/mcollective ++libdir = ${TRUEPREFIX}/libexec/mcollective + logger_type = console + loglevel = warn + +@@ -15,7 +15,20 @@ plugin.stomp.port = 61613 + plugin.stomp.user = mcollective + plugin.stomp.password = secret + ++# ActiveMQ connector ++#connector = activemq ++#plugin.activemq.pool.size = 2 ++#plugin.activemq.pool.1.host = stomp1.domain.tld ++#plugin.activemq.pool.1.port = 61613 ++#plugin.activemq.pool.1.user = me ++#plugin.activemq.pool.1.password = secret ++ ++#plugin.activemq.pool.2.host = stomp2.domain.tld ++#plugin.activemq.pool.2.port = 61613 ++#plugin.activemq.pool.2.user = me ++#plugin.activemq.pool.2.password = secret ++ + # Facts + factsource = yaml +-plugin.yaml = /etc/mcollective/facts.yaml ++plugin.yaml = ${SYSCONFDIR}/mcollective/facts.yaml + diff --git a/sysutils/mcollective/patches/patch-etc_server_cfg_dist b/sysutils/mcollective/patches/patch-etc_server_cfg_dist new file mode 100644 index 00000000000..9e8de761d3d --- /dev/null +++ b/sysutils/mcollective/patches/patch-etc_server_cfg_dist @@ -0,0 +1,34 @@ +$OpenBSD: patch-etc_server_cfg_dist,v 1.3 2013/03/18 09:37:46 ajacoutot Exp $ +--- etc/server.cfg.dist.orig Mon Mar 18 10:21:32 2013 ++++ etc/server.cfg.dist Mon Mar 18 10:25:15 2013 +@@ -1,7 +1,7 @@ + topicprefix = /topic/ + main_collective = mcollective + collectives = mcollective +-libdir = /usr/libexec/mcollective ++libdir = ${TRUEPREFIX}/libexec/mcollective + logfile = /var/log/mcollective.log + loglevel = info + daemonize = 1 +@@ -16,7 +16,20 @@ plugin.stomp.port = 61613 + plugin.stomp.user = mcollective + plugin.stomp.password = secret + ++# ActiveMQ connector ++#connector = activemq ++#plugin.activemq.pool.size = 2 ++#plugin.activemq.pool.1.host = stomp1.domain.tld ++#plugin.activemq.pool.1.port = 61613 ++#plugin.activemq.pool.1.user = me ++#plugin.activemq.pool.1.password = secret ++ ++#plugin.activemq.pool.2.host = stomp2.domain.tld ++#plugin.activemq.pool.2.port = 61613 ++#plugin.activemq.pool.2.user = me ++#plugin.activemq.pool.2.password = secret ++ + # Facts + factsource = yaml +-plugin.yaml = /etc/mcollective/facts.yaml ++plugin.yaml = ${SYSCONFDIR}/mcollective/facts.yaml + diff --git a/sysutils/mcollective/pkg/PLIST b/sysutils/mcollective/pkg/PLIST index 7656003957e..339a17f2e52 100644 --- a/sysutils/mcollective/pkg/PLIST +++ b/sysutils/mcollective/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2013/03/14 07:58:08 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.6 2013/03/18 09:37:46 ajacoutot Exp $ bin/mco ${MODRUBY_SITEDIR}/mcollective/ ${MODRUBY_SITEDIR}/mcollective.rb @@ -544,11 +544,10 @@ share/doc/mcollective/fr_file_index.html share/doc/mcollective/fr_method_index.html share/doc/mcollective/index.html share/doc/mcollective/rdoc-style.css -share/doc/pkg-readmes/${FULLPKGNAME} share/examples/mcollective/ @sample ${SYSCONFDIR}/mcollective/ share/examples/mcollective/client.cfg -@mode 0640 +@mode 0600 @sample ${SYSCONFDIR}/mcollective/client.cfg @mode share/examples/mcollective/facts.yaml @@ -558,7 +557,7 @@ share/examples/mcollective/plugin.d/ share/examples/mcollective/rpc-help.erb @sample ${SYSCONFDIR}/mcollective/rpc-help.erb share/examples/mcollective/server.cfg -@mode 0640 +@mode 0600 @sample ${SYSCONFDIR}/mcollective/server.cfg @mode share/examples/mcollective/ssl/ diff --git a/sysutils/mcollective/pkg/README b/sysutils/mcollective/pkg/README deleted file mode 100644 index b7d51f9324e..00000000000 --- a/sysutils/mcollective/pkg/README +++ /dev/null @@ -1,23 +0,0 @@ -$OpenBSD: README,v 1.2 2013/03/14 07:58:08 ajacoutot Exp $ - -+----------------------------------------------------------------------- -| Running ${FULLPKGNAME} on OpenBSD -+----------------------------------------------------------------------- - -Middleware layer -================ - -In order to use MCollective a middleware layer needs to be present -inside the network. While RabbitMQ is supported, it is advised to use -ActiveMQ. The packages can be installed with their respective commands: - - # pkg_add apache-activemq -or - # pkg_add rabbitmq - -Configuration -============= - -For more information on configuring and running MCollective, please -refer to the online documentation available at the following address: -http://docs.puppetlabs.com/mcollective/reference/basic/gettingstarted.html