--- a/components/ruby/mcollective/files/mcollective.xml Tue Jun 07 03:52:57 2016 -0700
+++ b/components/ruby/mcollective/files/mcollective.xml Tue Aug 23 23:04:14 2016 -0700
@@ -46,24 +46,8 @@
value='solaris.smf.value.mcollective' />
</property_group>
- <instance enabled="false" name="server">
+ <instance enabled="false" name="default">
<!-- Server instance of service -->
- <exec_method timeout_seconds="60" type="method" name="start"
- exec="/lib/svc/method/mcollective %m"/>
- <property_group name='config' type='application'>
- <propval name='server_config_path' type='astring'
- value='/etc/mcollective/server.conf'/>
- </property_group>
-
- </instance>
-
- <instance enabled="false" name="client">
- <!-- Client instance of service -->
- <property_group name='general' type='framework'>
- <propval name='client_config_path' type='astring'
- value='/etc/mcollective/client.conf'/>
- </property_group>
-
</instance>
<template>
@@ -78,7 +62,7 @@
service
-->
<loctext xml:lang="C">
- mco-svr is MCOllective server daemon
+ mcollectived is MCollective server daemon
</loctext>
</description>
</template>
--- a/components/ruby/mcollective/patches/01-mco-client-config.patch Tue Jun 07 03:52:57 2016 -0700
+++ b/components/ruby/mcollective/patches/01-mco-client-config.patch Tue Aug 23 23:04:14 2016 -0700
@@ -6,8 +6,8 @@
NOTE : This patch is developed in-house (and Solaris specific)
---- mcollective-2.8.2/etc/client.cfg.dist.orig 2016-04-20 09:42:43.785159244 -0700
-+++ mcollective-2.8.2/etc/client.cfg.dist 2016-04-20 12:07:58.755907466 -0700
+--- marionette-collective-2.8.8/etc/client.cfg.dist.orig 2016-04-20 09:42:43.785159244 -0700
++++ marionette-collective-2.8.8/etc/client.cfg.dist 2016-04-20 12:07:58.755907466 -0700
@@ -1,19 +1,26 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
--- a/components/ruby/mcollective/patches/02-mco-server-config.patch Tue Jun 07 03:52:57 2016 -0700
+++ b/components/ruby/mcollective/patches/02-mco-server-config.patch Tue Aug 23 23:04:14 2016 -0700
@@ -6,8 +6,8 @@
NOTE : This patch is developed in-house (and Solaris specific)
---- mcollective-2.8.2/etc/server.cfg.dist.orig 2016-04-20 12:36:27.556854540 -0700
-+++ mcollective-2.8.2/etc/server.cfg.dist 2016-04-20 12:37:10.186932498 -0700
+--- marionette-collective-2.8.8/etc/server.cfg.dist.orig 2016-04-20 12:36:27.556854540 -0700
++++ marionette-collective-2.8.8/etc/server.cfg.dist 2016-04-20 12:37:10.186932498 -0700
@@ -1,7 +1,13 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/mcollective/patches/04-mco-svr-daemonize.patch Tue Aug 23 23:04:14 2016 -0700
@@ -0,0 +1,11 @@
+--- marionette-collective-2.8.8/etc/server.cfg.dist.orig 2016-08-10 21:53:26.798826693 -0700
++++ marionette-collective-2.8.8/etc/server.cfg.dist 2016-08-10 21:53:52.454927427 -0700
+@@ -9,7 +9,7 @@
+ # Send output to SMF service log
+ logfile = /dev/stderr
+ loglevel = info
++daemonize = 0
+-daemonize = 1
+
+ # Plugins
+ securityprovider = psk