Hmmm, I forgot to include server.cfg in /usr/share/mcollective into
package mcollective. Therefore, package still fail to install.

Same problem happens with client.cfg which wasn't installed in
/usr/share/mcollective-client into mcollective-client package.

Please find attached a new patch which works.

Sorry for the noise.

By the way, /etc/mcollective/server.cfg won't be updated from
mcollective 2.0.0 (wheezy), since it already exists.

Problem is mcollective 2.0.0 use stomp as default connector.
This connector is not provided anymore by mcollective 2.6.0.
Therefore mcollective won't start after upgrade, even if enabled in
/etc/default/mcollective.

We should find a way to update /etc/mcollective/server.cfg with new
default version if it was not modified, or warn user about stomp removal
if it was.

Regards,
Jean Baptiste

On 15/11/2014 22:55, Jean Baptiste Favre wrote:
> Hello,
> I worked on this bug during Debian BSP in Paris with Julien.
> 
> Here is a patch to remove /etc/mcollective/server.cfg &
> /etc/mcollective/client.cfg from their respective package.
> They still are installed, when missing, from postinst script.
> 
> I didn't remove /etc/default/mcollective, which is still provided by
> mcollective package, since it's not modified anymore by any postint script.
> 
> Cheers,
> Jean Baptiste
diff -Nru mcollective-2.6.0+dfsg/debian/changelog mcollective-2.6.0+dfsg/debian/changelog
--- mcollective-2.6.0+dfsg/debian/changelog	2014-10-14 14:18:57.000000000 +0200
+++ mcollective-2.6.0+dfsg/debian/changelog	2014-11-15 23:24:40.000000000 +0100
@@ -1,3 +1,11 @@
+mcollective (2.6.0+dfsg-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove server & client config files from package since they are modified
+    by postinst. (Closes: #767936)
+
+ -- Jean Baptiste Favre <deb...@jbfavre.org>  Fri, 14 Nov 2014 18:12:24 +0100
+
 mcollective (2.6.0+dfsg-1) unstable; urgency=low
 
   * Imported Upstream version 2.6.0+dfsg
diff -Nru mcollective-2.6.0+dfsg/debian/mcollective-client.dirs mcollective-2.6.0+dfsg/debian/mcollective-client.dirs
--- mcollective-2.6.0+dfsg/debian/mcollective-client.dirs	2014-10-14 14:18:57.000000000 +0200
+++ mcollective-2.6.0+dfsg/debian/mcollective-client.dirs	2014-11-15 23:25:46.000000000 +0100
@@ -1,2 +1,3 @@
 etc/mcollective
+usr/share/mcollective-client
 usr/bin
diff -Nru mcollective-2.6.0+dfsg/debian/mcollective.dirs mcollective-2.6.0+dfsg/debian/mcollective.dirs
--- mcollective-2.6.0+dfsg/debian/mcollective.dirs	2014-10-14 14:18:57.000000000 +0200
+++ mcollective-2.6.0+dfsg/debian/mcollective.dirs	2014-11-15 23:25:37.000000000 +0100
@@ -1,2 +1,3 @@
 etc/mcollective
+usr/share/mcollective
 usr/sbin
diff -Nru mcollective-2.6.0+dfsg/debian/rules mcollective-2.6.0+dfsg/debian/rules
--- mcollective-2.6.0+dfsg/debian/rules	2014-10-14 14:18:57.000000000 +0200
+++ mcollective-2.6.0+dfsg/debian/rules	2014-11-15 23:24:40.000000000 +0100
@@ -4,8 +4,8 @@
 	dh $@ --buildsystem=ruby --with ruby,systemd
 
 override_dh_auto_install:
-	cp $(CURDIR)/etc/server.cfg.dist $(CURDIR)/debian/mcollective/etc/mcollective/server.cfg
-	cp $(CURDIR)/etc/client.cfg.dist $(CURDIR)/debian/mcollective-client/etc/mcollective/client.cfg
+	cp $(CURDIR)/etc/server.cfg.dist $(CURDIR)/debian/mcollective/usr/share/mcollective/server.cfg
+	cp $(CURDIR)/etc/client.cfg.dist $(CURDIR)/debian/mcollective-client/usr/share/mcollective-client/client.cfg
 	cp $(CURDIR)/etc/facts.yaml.dist $(CURDIR)/debian/mcollective-common/etc/mcollective/facts.yaml
 	cp $(CURDIR)/etc/rpc-help.erb $(CURDIR)/debian/mcollective-common/etc/mcollective/rpc-help.erb
 	cp -R  $(CURDIR)/lib/* $(CURDIR)/debian/mcollective-common/usr/lib/ruby/vendor_ruby/

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to