Merge lp:~lynxman/ubuntu/natty/mcollective/natty-upstart into lp:ubuntu/natty/mcollective

[Marc Cluet]

* Changes upstart script to not daemonize, avoid multiple daemonize scenario
* Modified server.cfg to reflect change

[Brian Murray (brian-murray)]

For this to be fixed in Natty as an SRU we'll need to have a bug report documenting the issue. (https://wiki.ubuntu.com/StableReleaseUpdates) I looked at the open mcollective bug reports and there aren't any about this particular issue. Could you report a bug following the SRU procedure if you'd like to see this fixed in Natty? Thanks in advance.

review: Needs Information

Unmerged revisions

7. By Marc Cluet on 2011-04-18

Modified upstart script

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-23 03:09:22 +0000
+++ debian/changelog	2011-04-18 19:02:27 +0000
@@ -1,3 +1,10 @@
+mcollective (1.0.1-0ubuntu3) natty; urgency=low
+
+  * Modified upstart script to avoid daemonize, this solves a multiple run
+    scenario
+
+ -- Marc Cluet <[e-mail]>  Mon, 18 Apr 2011 14:48:44 -0500
+
 mcollective (1.0.1-0ubuntu2) natty; urgency=low
 
   * debian/mcollective.triggers, debian/mcollective.postinst: install dpkg

=== modified file 'debian/mcollective.upstart'
--- debian/mcollective.upstart	2011-02-01 09:15:08 +0000
+++ debian/mcollective.upstart	2011-04-18 19:02:27 +0000
@@ -3,7 +3,7 @@
 
 start on runlevel [2345]
 stop on runlevel [!2345]
-expect daemon
+respawn
 
-export RUBYLIB=/usr/local/lib/site_ruby/1.8:$RUBYLIB
+env RUBYLIB=/usr/local/lib/site_ruby/1.8:$RUBYLIB
 exec /usr/sbin/mcollectived --pid="/var/run/mcollectived.pid" --config="/etc/mcollective/server.cfg"

=== modified file 'etc/client.cfg.dist'
--- etc/client.cfg.dist	2011-02-01 09:15:08 +0000
+++ etc/client.cfg.dist	2011-04-18 19:02:27 +0000
@@ -2,6 +2,7 @@
 libdir = /usr/share/mcollective
 logfile = /dev/null
 loglevel = info
+daemonize = 0
 
 # Plugins 
 securityprovider = psk