diff -Nru mcollective-1.2.1+dfsg/debian/changelog mcollective-1.2.1+dfsg/debian/changelog --- mcollective-1.2.1+dfsg/debian/changelog 2011-11-01 04:42:29.000000000 -0700 +++ mcollective-1.2.1+dfsg/debian/changelog 2011-11-10 05:56:13.000000000 -0800 @@ -1,3 +1,16 @@ +mcollective (1.2.1+dfsg-2ubuntu1) precise; urgency=low + + * Merge from debian unstable, remaining changes (LP: #874981) + - debian/control: Package mcollective-middleware allows the user + to install mcollective + his AMPQ server of choice, we now + choose activemq by default but support for rabbitmq-stomp is + also integrated + - debian/control: Fixed rabbitmq dependencies to rabbitmq-stomp + - debian/mcollective.postinst: Added fix for mcollective server.cfg to + avoid daemonize if running on system with upstart + + -- Marc Cluet Wed, 9 Nov 2011 18:12:27 +0000 + mcollective (1.2.1+dfsg-2) unstable; urgency=low * configuration files: chmod 600, prevent world-readable (Closes: #643624) diff -Nru mcollective-1.2.1+dfsg/debian/control mcollective-1.2.1+dfsg/debian/control --- mcollective-1.2.1+dfsg/debian/control 2011-11-01 04:42:29.000000000 -0700 +++ mcollective-1.2.1+dfsg/debian/control 2011-11-10 15:30:57.000000000 -0800 @@ -1,10 +1,10 @@ Source: mcollective Section: utils Priority: optional -Maintainer: Puppet Package Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Puppet Package Maintainers Uploaders: Jonas Genannt , Micah Anderson Build-Depends: debhelper (>= 8) -DM-Upload-Allowed: yes Standards-Version: 3.9.2 Homepage: http://projects.puppetlabs.com/projects/mcollective Vcs-Git: git://git.debian.org/git/pkg-puppet/mcollective.git @@ -15,21 +15,32 @@ Depends: ${misc:Depends}, ruby | ruby-interpreter, mcollective-common (>= ${source:Version}) Suggests: activemq Recommends: mcollective-client -Description: Marionette Collective clustering framework - server +Description: build server orchestration or parallel job execution systems The Marionette Collective is a framework for building server orchestration and parallel job execution systems. . This package contains the MCollective daemon. +Package: mcollective-middleware +Architecture: all +Depends: ${misc:Depends}, activemq | rabbitmq-stomp, mcollective +Description: build server orchestration or parallel job execution systems + The Marionette Collective aka. mcollective is a framework + to build server orchestration or parallel job execution system + . + This meta package installs the STOMP server, in addition + to the mcollective orchestration and parallel + job execution system. + Package: mcollective-client Architecture: all Suggests: mcollective Depends: ${misc:Depends}, ruby | ruby-interpreter, mcollective-common (>= ${source:Version}) -Description: Marionette Collective clustering framework - clients - The Marionette Collective is a framework for building server - orchestration and parallel job execution systems. +Description: build server orchestration or parallel job execution systems + The Marionette Collective aka. mcollective is a framework + to build server orchestration or parallel job execution system . - This package provides the MCollective client utilities: + This package contains the MCollective client utilities: * mco * mc-rpc * mc-facts @@ -42,8 +53,8 @@ Package: mcollective-common Architecture: all Suggests: mcollective-doc -Depends: ${misc:Depends}, ruby | ruby-interpreter, rubygems, ruby-stomp, ruby-systemu, ruby-json -Description: Marionette Collective clustering framework - common files +Depends: ${misc:Depends}, ruby | ruby-interpreter, rubygems, libstomp-ruby, libsystemu-ruby, ruby-json +Description: build server orchestration or parallel job execution systems The Marionette Collective is a framework for building server orchestration and parallel job execution systems. . @@ -53,7 +64,7 @@ Architecture: all Section: doc Depends: ${misc:Depends} -Description: Marionette Collective clustering framework - documentation +Description: Documentation for mcollective The Marionette Collective is a framework for building server orchestration and parallel job execution systems. . diff -Nru mcollective-1.2.1+dfsg/debian/mcollective-client.config mcollective-1.2.1+dfsg/debian/mcollective-client.config --- mcollective-1.2.1+dfsg/debian/mcollective-client.config 1969-12-31 16:00:00.000000000 -0800 +++ mcollective-1.2.1+dfsg/debian/mcollective-client.config 2011-06-27 10:22:02.000000000 -0700 @@ -0,0 +1,9 @@ +#!/bin/sh -e +# A simplified version of debconf's own config script. +. /usr/share/debconf/confmodule +# Ask for the stomp host +db_get mcollective/stomp_host || true +[ -z "$RET" ] && db_set mcollective/stomp_host "$(hostname)" +db_input high mcollective/stomp_host || true +db_input medium mcollective/psk_key || true +db_go diff -Nru mcollective-1.2.1+dfsg/debian/mcollective-client.templates mcollective-1.2.1+dfsg/debian/mcollective-client.templates --- mcollective-1.2.1+dfsg/debian/mcollective-client.templates 1969-12-31 16:00:00.000000000 -0800 +++ mcollective-1.2.1+dfsg/debian/mcollective-client.templates 2011-07-11 07:46:52.000000000 -0700 @@ -0,0 +1,11 @@ +Template: mcollective/stomp_host +Type: string +_Description: Location of the STOMP MPQ server: + mcollective depends on a STOMP server to pass messages + amongst the collective. + +Template: mcollective/psk_key +Type: password +_Description: PSK Key for mcollective: + mcollective encrypts all its messages using a pre-shared key (PSK) + by default it'll be set to "unset", you should change this diff -Nru mcollective-1.2.1+dfsg/debian/mcollective-common.templates mcollective-1.2.1+dfsg/debian/mcollective-common.templates --- mcollective-1.2.1+dfsg/debian/mcollective-common.templates 2011-11-01 04:42:29.000000000 -0700 +++ mcollective-1.2.1+dfsg/debian/mcollective-common.templates 2011-09-10 03:23:55.000000000 -0700 @@ -1,42 +1,31 @@ -# These templates have been reviewed by the debian-l10n-english -# team -# -# If modifications/additions/rewording are needed, please ask -# debian-l10n-english@lists.debian.org for advice. -# -# Even minor modifications require translation updates and such -# changes should be coordinated with translators and reviewers. - Template: mcollective/security_psk Type: string Default: unset -_Description: MCollective PSK: - Please specify the Pre-Shared Key that should be used between - MCollective instances. +_Description: Security PSK key for all MCollective instances: + Please specify the psk for security within your MCollective + instances Template: mcollective/stomp_host Type: string Default: localhost -_Description: Message Queue server host: - Please specify the hostname or IP address of the Message Queue server - for MCollective. +_Description: Hostname of your ActiveMQ host: + Please specify the hostname/ip address of your Message Queue + server (Apache ActiceMQ). Template: mcollective/stomp_port Type: string Default: 6163 -_Description: Message Queue server port: - Please specify the listening port of the Message Queue server. +_Description: Port of your ActiveMQ instance: + Please specify the port of your Message Queue server (Apache ActiveMQ). Template: mcollective/stomp_user Type: string Default: mcollective -_Description: Message Queue server username: - Please specify the STOMP username that should be used with the - Message Queue server. +_Description: STOMP user from your ActiveMQ instance: + Please specify the username of your Message Queue server (Apache ActiveMQ). Template: mcollective/stomp_password Type: password Default: marionette -_Description: Message Queue server password: - Please specify the STOMP password that should be used with the - Message Queue server. +_Description: STOMP password from your ActiveMQ instance: + Please specify the password of your Message Queue server (Apache ActiveMQ). diff -Nru mcollective-1.2.1+dfsg/debian/mcollective-middleware.postinst mcollective-1.2.1+dfsg/debian/mcollective-middleware.postinst --- mcollective-1.2.1+dfsg/debian/mcollective-middleware.postinst 1969-12-31 16:00:00.000000000 -0800 +++ mcollective-1.2.1+dfsg/debian/mcollective-middleware.postinst 2011-11-10 05:16:34.000000000 -0800 @@ -0,0 +1,28 @@ +#!/bin/sh -e + + +# We give precedence to activemq config +if hash activemq > /dev/null 2>&1; then + if [ ! -d /etc/activemq/instances-available/mcollective ]; then + mkdir -p /etc/activemq/instances-available/mcollective + fi + if [ ! -f /etc/activemq/instances-available/mcollective/activemq.xml ]; then + cp -p /usr/share/doc/mcollective/examples/activemq.xml /etc/activemq/instances-available/mcollective + fi + if [ ! -h /etc/activemq/instances-enabled/mcollective ]; then + ln -sf /etc/activemq/instances-available/mcollective /etc/activemq/instances-enabled/mcollective + fi + invoke-rc.d activemq stop || : + invoke-rc.d activemq start + +elif hash rabbitmqctl >/dev/null 2>&1; then + # Add the 'mcollective' user, with password, 'marionette', if none exists + if [ "$(rabbitmqctl list_users | grep -c mcollective)" = "0" ]; then + rabbitmqctl add_user mcollective marionette + rabbitmqctl set_permissions mcollective \.\* \.\* \.\* + else + true + fi +fi + +#DEBHELPER# diff -Nru mcollective-1.2.1+dfsg/debian/mcollective-middleware.postrm mcollective-1.2.1+dfsg/debian/mcollective-middleware.postrm --- mcollective-1.2.1+dfsg/debian/mcollective-middleware.postrm 1969-12-31 16:00:00.000000000 -0800 +++ mcollective-1.2.1+dfsg/debian/mcollective-middleware.postrm 2011-11-09 10:25:11.000000000 -0800 @@ -0,0 +1,27 @@ +#!/bin/sh -e + +# We give precedence to activemq config +if hash activemq > /dev/null 2>&1; then + if [ -h /etc/activemq/instances-enabled/mcollective ]; then + rm -f /etc/activemq/instances-enabled/mcollective + fi + if [ -f /etc/activemq/instances-available/mcollective/activemq.xml ]; then + rm -f /etc/activemq/instances-available/mcollective/activemq.xml + fi + if [ -d /etc/activemq/instances-available/mcollective ]; then + rmdir /etc/activemq/instances-available/mcollective + fi + service activemq stop + service activemq start +fi +if hash rabbitmqctl >/dev/null 2>&1; then + # Remove the 'mcollective' user + if [ "$(rabbitmqctl list_users | grep -c mcollective)" != "0" ]; then + rabbitmqctl delete_user mcollective || true + rabbitmqctl clear_permissions mcollective || true + else + true + fi +fi + +#DEBHELPER# diff -Nru mcollective-1.2.1+dfsg/debian/mcollective.postinst mcollective-1.2.1+dfsg/debian/mcollective.postinst --- mcollective-1.2.1+dfsg/debian/mcollective.postinst 2011-11-01 04:42:29.000000000 -0700 +++ mcollective-1.2.1+dfsg/debian/mcollective.postinst 2011-11-09 11:20:31.000000000 -0800 @@ -14,6 +14,10 @@ cp /usr/share/mcollective/server.cfg $MCOLLECTIVE_SERVER_CFG fi + if [ -f /etc/init/mcollective.conf ]; then + sed -i "s@^daemonize.*@daemonize = 0@" $MCOLLECTIVE_SERVER_CFG + fi + chmod 600 $MCOLLECTIVE_SERVER_CFG db_get mcollective/start_on_boot diff -Nru mcollective-1.2.1+dfsg/debian/mcollective.templates mcollective-1.2.1+dfsg/debian/mcollective.templates --- mcollective-1.2.1+dfsg/debian/mcollective.templates 2011-11-01 04:42:29.000000000 -0700 +++ mcollective-1.2.1+dfsg/debian/mcollective.templates 2011-09-10 03:23:55.000000000 -0700 @@ -1,15 +1,5 @@ -# These templates have been reviewed by the debian-l10n-english -# team -# -# If modifications/additions/rewording are needed, please ask -# debian-l10n-english@lists.debian.org for advice. -# -# Even minor modifications require translation updates and such -# changes should be coordinated with translators and reviewers. - Template: mcollective/start_on_boot Type: boolean Default: false -_Description: Start MCollective on boot? - Please choose whether the MCollective daemon should be started when - booting this machine. +_Description: Should MCollective started onboot? + Start MCollective daemon onboot. diff -Nru mcollective-1.2.1+dfsg/debian/mcollective.triggers mcollective-1.2.1+dfsg/debian/mcollective.triggers --- mcollective-1.2.1+dfsg/debian/mcollective.triggers 1969-12-31 16:00:00.000000000 -0800 +++ mcollective-1.2.1+dfsg/debian/mcollective.triggers 2011-05-18 08:40:39.000000000 -0700 @@ -0,0 +1 @@ +interest /usr/share/mcollective/plugins diff -Nru mcollective-1.2.1+dfsg/debian/mcollective.upstart mcollective-1.2.1+dfsg/debian/mcollective.upstart --- mcollective-1.2.1+dfsg/debian/mcollective.upstart 1969-12-31 16:00:00.000000000 -0800 +++ mcollective-1.2.1+dfsg/debian/mcollective.upstart 2011-11-09 11:00:51.000000000 -0800 @@ -0,0 +1,9 @@ +description "mcollective daemon" +author "Marc Cluet " + +start on runlevel [2345] +stop on runlevel [!2345] +respawn + +env RUBYLIB=/usr/local/lib/site_ruby/1.8:$RUBYLIB +exec /usr/sbin/mcollectived --pid="/var/run/mcollectived.pid" --config="/etc/mcollective/server.cfg" diff -Nru mcollective-1.2.1+dfsg/debian/patches/drop-init-script.patch mcollective-1.2.1+dfsg/debian/patches/drop-init-script.patch --- mcollective-1.2.1+dfsg/debian/patches/drop-init-script.patch 1969-12-31 16:00:00.000000000 -0800 +++ mcollective-1.2.1+dfsg/debian/patches/drop-init-script.patch 2011-05-18 08:40:39.000000000 -0700 @@ -0,0 +1,16 @@ +Description: Dont ship the upstream init script +Author: Dustin Kirkland +Upstream: no +diff -Naurp mcollective-1.0.0.orig//ext/Makefile mcollective-1.0.0//ext/Makefile +--- mcollective-1.0.0.orig//ext/Makefile 2010-12-11 12:03:30.000000000 -0500 ++++ mcollective-1.0.0//ext/Makefile 2011-01-26 15:19:51.576705422 -0500 +@@ -19,9 +19,7 @@ install-lib: + + install-conf: + install -d $(DESTDIR)/etc/mcollective/ +- install -d $(DESTDIR)/etc/init.d + cp -r etc/* $(DESTDIR)/etc/mcollective/ +- cp mcollective.init $(DESTDIR)/etc/init.d/mcollective + rm $(DESTDIR)/etc/mcollective/ssl/PLACEHOLDER + rm $(DESTDIR)/etc/mcollective/ssl/clients/PLACEHOLDER + diff -Nru mcollective-1.2.1+dfsg/debian/patches/nodaemonize.server.patch mcollective-1.2.1+dfsg/debian/patches/nodaemonize.server.patch --- mcollective-1.2.1+dfsg/debian/patches/nodaemonize.server.patch 1969-12-31 16:00:00.000000000 -0800 +++ mcollective-1.2.1+dfsg/debian/patches/nodaemonize.server.patch 2011-06-27 06:07:01.000000000 -0700 @@ -0,0 +1,15 @@ +Description: Avoid the server from daemonizing, that is taken care of by upstart +Author: Marc Cluet +Upstream: no +diff -uNr mcollective-1.2.0.orig/etc/server.cfg.dist mcollective-1.2.0/etc/server.cfg.dist +--- mcollective-1.2.0.orig/etc/server.cfg.dist 2011-06-27 06:04:13.000000000 -0700 ++++ mcollective-1.2.0/etc/server.cfg.dist 2011-06-27 06:05:49.540289982 -0700 +@@ -4,7 +4,7 @@ + libdir = /usr/share/mcollective/plugins + logfile = /var/log/mcollective.log + loglevel = info +-daemonize = 1 ++daemonize = 0 + + # Plugins + securityprovider = psk diff -Nru mcollective-1.2.1+dfsg/debian/README.source mcollective-1.2.1+dfsg/debian/README.source --- mcollective-1.2.1+dfsg/debian/README.source 2011-11-01 04:42:29.000000000 -0700 +++ mcollective-1.2.1+dfsg/debian/README.source 2011-09-10 03:23:55.000000000 -0700 @@ -3,7 +3,7 @@ This source is created by pre-stripping the embedded systemu and json library from the upstream tarball. The Debian package of mcollective depends on -ruby-systemu and ruby-json Debian packages. +libsystemu-ruby and ruby-json Debian packages. Also ext/activemq/wlcg-patch.tgz and ext/activemq/apache-activemq.spec was removed from Debian source tarball. It contains stuff from the ActiveMQ