[Pkg-puppet-devel] [RFR] templates://mcollective/{mcollective-common.templates, mcollective.templates}

[Justin B Rye]

Christian PERRIER wrote:
> To make everybody happy, maybe the long description for the
> username/password templates could mention the STOMP protocol?

Attached; I'm still wondering if there's a neat way of tacking on a
hint along the lines of "by Message Queue server we currently only
mean Apache ActiveMQ".
-- 
JBR	with qualifications in linguistics, experience as a Debian
	sysadmin, and probably no clue about this particular package
-------------- next part --------------
diff -ru old/control new/control
--- old/control	2011-09-17 11:38:17.885960613 +0100
+++ new/control	2011-09-22 13:52:32.225960502 +0100
@@ -14,9 +14,9 @@
 Depends: ${misc:Depends}, ruby | ruby-interpreter, mcollective-common (>= ${source:Version})
 Suggests: activemq
 Recommends: mcollective-client
-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 systems.
+Description: Marionette Collective clustering framework - server
+ The Marionette Collective is a framework for building server
+ orchestration and parallel job execution systems.
  .
  This package contains the MCollective daemon.
 
@@ -24,36 +24,36 @@
 Architecture: all
 Suggests: mcollective
 Depends: ${misc:Depends}, ruby | ruby-interpreter, mcollective-common (>= ${source:Version})
-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
+Description: Marionette Collective clustering framework - clients
+ The Marionette Collective is a framework for building server
+ orchestration and parallel job execution systems.
  .
- This package contains the MCollective client stuff:
-  - mco
-  - mc-rpc
-  - mc-facts
-  - mc-find-hosts
-  - mc-ping
-  - mc-call-agent
-  - mc-controller
-  - mc-inventory
+ This package provides the MCollective client utilities:
+  * mco
+  * mc-rpc
+  * mc-facts
+  * mc-find-hosts
+  * mc-ping
+  * mc-call-agent
+  * mc-controller
+  * mc-inventory
 
 Package: mcollective-common
 Architecture: all
 Suggests: mcollective-doc
 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 aka. mcollective is a framework
- to build server orchestration or parallel job execution systems.
+Description: Marionette Collective clustering framework - common files
+ The Marionette Collective is a framework for building server
+ orchestration and parallel job execution systems.
  .
- Common files for mcollective packages.
+ This package provides common files for MCollective.
 
 Package: mcollective-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Description: Documentation for mcollective
- The Marionette Collective aka. mcollective is a framework
- to build server orchestration or parallel job execution systems.
+Description: Marionette Collective clustering framework - documentation
+ The Marionette Collective is a framework for building server
+ orchestration and parallel job execution systems.
  .
- Documentation package.
+ This package provides documentation for MCollective.
diff -ru old/mcollective-common.templates new/mcollective-common.templates
--- old/mcollective-common.templates	2011-09-17 11:38:11.589961090 +0100
+++ new/mcollective-common.templates	2011-09-28 11:27:58.333960692 +0100
@@ -1,31 +1,33 @@
 Template: mcollective/security_psk
 Type: string
 Default: unset
-_Description: Security PSK key for all MCollective instances:
- Please specify the psk for security within your MCollective
- instances
+_Description: MCollective PSK:
+ Please specify the Pre-Shared Key that should be used between
+ MCollective instances.
 
 Template: mcollective/stomp_host
 Type: string
 Default: localhost
-_Description: Hostname of your ActiveMQ host:
- Please specify the hostname/ip address of your Message Queue
- server (Apache ActiceMQ).
+_Description: Message Queue server host:
+ Please specify the hostname or IP address of the Message Queue server
+ for MCollective.
 
 Template: mcollective/stomp_port
 Type: string
 Default: 6163
-_Description: Port of your ActiveMQ instance:
- Please specify the port of your Message Queue server (Apache ActiveMQ).
+_Description: Message Queue server port:
+ Please specify the listening port of the Message Queue server.
 
 Template: mcollective/stomp_user
 Type: string
 Default: mcollective
-_Description: STOMP user from your ActiveMQ instance:
- Please specify the username of your Message Queue server (Apache ActiveMQ).
+_Description: Message Queue server username:
+ Please specify the STOMP username that should be used with the
+ Message Queue server.
 
 Template: mcollective/stomp_password
 Type: password
 Default: marionette
-_Description: STOMP password from your ActiveMQ instance:
- Please specify the password of your Message Queue server (Apache ActiveMQ).
+_Description: Message Queue server password:
+ Please specify the STOMP password that should be used with the
+ Message Queue server.
diff -ru old/mcollective.templates new/mcollective.templates
--- old/mcollective.templates	2011-09-17 11:38:14.329960487 +0100
+++ new/mcollective.templates	2011-09-22 13:44:11.297960323 +0100
@@ -1,5 +1,6 @@
 Template: mcollective/start_on_boot
 Type: boolean
 Default: false
-_Description: Should MCollective started onboot?
- Start MCollective daemon onboot.
+_Description: Start MCollective on boot?
+ Please choose whether the MCollective daemon should be started when
+ booting this machine.
-------------- next part --------------
Source: mcollective
Section: utils
Priority: optional
Maintainer: Puppet Package Maintainers <pkg-puppet-devel at lists.alioth.debian.org>
Uploaders: Jonas Genannt <jonas.genannt at capi2name.de>, Micah Anderson <micah at debian.org>
Build-Depends: debhelper (>= 8)
Standards-Version: 3.9.2
Homepage: http://projects.puppetlabs.com/projects/mcollective
Vcs-Git: git://git.debian.org/git/pkg-puppet/mcollective.git
Vcs-Browser: http://git.debian.org/?p=pkg-puppet/mcollective.git

Package: mcollective
Architecture: all
Depends: ${misc:Depends}, ruby | ruby-interpreter, mcollective-common (>= ${source:Version})
Suggests: activemq
Recommends: mcollective-client
Description: Marionette Collective clustering framework - server
 The Marionette Collective is a framework for building server
 orchestration and parallel job execution systems.
 .
 This package contains the MCollective daemon.

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.
 .
 This package provides the MCollective client utilities:
  * mco
  * mc-rpc
  * mc-facts
  * mc-find-hosts
  * mc-ping
  * mc-call-agent
  * mc-controller
  * mc-inventory

Package: mcollective-common
Architecture: all
Suggests: mcollective-doc
Depends: ${misc:Depends}, ruby | ruby-interpreter, rubygems, libstomp-ruby, libsystemu-ruby, ruby-json
Description: Marionette Collective clustering framework - common files
 The Marionette Collective is a framework for building server
 orchestration and parallel job execution systems.
 .
 This package provides common files for MCollective.

Package: mcollective-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
Description: Marionette Collective clustering framework - documentation
 The Marionette Collective is a framework for building server
 orchestration and parallel job execution systems.
 .
 This package provides documentation for MCollective.
-------------- next part --------------
Template: mcollective/security_psk
Type: string
Default: unset
_Description: MCollective PSK:
 Please specify the Pre-Shared Key that should be used between
 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.

Template: mcollective/stomp_port
Type: string
Default: 6163
_Description: Message Queue server port:
 Please specify the listening port of the Message Queue server.

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.

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.
-------------- next part --------------
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.