# HG changeset patch
# User Matt Keenan <matt.keenan@oracle.com>
# Date 1456506727 0
# Node ID a25ccbe6d0ea10ebaf538735cbc5e6ad87e7491f
# Parent  ee1e63d0dcac6c6473d414392070d685708d516d
22649883 mcollective client.cfg and server.cfg should log to SMF service log

diff -r ee1e63d0dcac -r a25ccbe6d0ea components/ruby/mcollective/patches/01-mco-client-config.patch
--- a/components/ruby/mcollective/patches/01-mco-client-config.patch	Fri Feb 26 08:37:20 2016 -0800
+++ b/components/ruby/mcollective/patches/01-mco-client-config.patch	Fri Feb 26 17:12:07 2016 +0000
@@ -5,20 +5,22 @@
 
 NOTE : This patch is developed in-house (and Solaris specific)
 
---- mcollective-2.8.2/etc/client.cfg.dist.orig      2015-05-14 08:50:32.000000000 -0700
-+++ mcollective-2.8.2/etc/client.cfg.dist       2015-11-19 12:01:30.945604310 -0800
-@@ -1,6 +1,6 @@
+--- ORIG/etc/client.cfg.dist	2016-02-23 13:46:36.467073673 +0000
++++ mcollective-2.8.2/etc/client.cfg.dist	2016-02-24 17:18:00.911791673 +0000
+@@ -1,19 +1,21 @@
  main_collective = mcollective
  collectives = mcollective
 -libdir = /usr/libexec/mcollective
+-logger_type = console
 +libdir = /usr/share/mcollective
- logger_type = console
++logger_type = file
++logfile = /dev/stderr           # Send output to SMF service log
  loglevel = warn
-
-@@ -8,12 +8,13 @@ loglevel = warn
+ 
+ # Plugins
  securityprovider = psk
  plugin.psk = unset
-
+ 
 -connector = activemq
 -plugin.activemq.pool.size = 1
 -plugin.activemq.pool.1.host = stomp1
@@ -32,6 +34,6 @@
 +plugin.rabbitmq.pool.1.port = 61613
 +plugin.rabbitmq.pool.1.user = mcollective
 +plugin.rabbitmq.pool.1.password = changeme
-
+ 
  # Facts
  factsource = yaml
diff -r ee1e63d0dcac -r a25ccbe6d0ea components/ruby/mcollective/patches/02-mco-server-config.patch
--- a/components/ruby/mcollective/patches/02-mco-server-config.patch	Fri Feb 26 08:37:20 2016 -0800
+++ b/components/ruby/mcollective/patches/02-mco-server-config.patch	Fri Feb 26 17:12:07 2016 +0000
@@ -4,22 +4,23 @@
     Default user : 'mcollective' & passwd : 'changeme'
 NOTE : This patch is developed in-house (and Solaris specific)
 
---- mcollective-2.8.2/etc/server.cfg.dist.orig	2015-05-14 08:50:32.000000000 -0700
-+++ mcollective-2.8.2/etc/server.cfg.dist	2015-05-14 08:50:32.000000000 -0700
-@@ -1,7 +1,7 @@
+--- ORIG/etc/server.cfg.dist	2016-02-23 13:46:36.467260235 +0000
++++ mcollective-2.8.2/etc/server.cfg.dist	2016-02-24 17:17:34.551817568 +0000
+@@ -1,7 +1,8 @@
  main_collective = mcollective
  collectives = mcollective
 -libdir = /usr/libexec/mcollective
 -logfile = /var/log/mcollective.log
 +libdir = /usr/share/mcollective
-+logfile = /var/log/mcollective/mcollective.log
++logger_type = file
++logfile = /dev/stderr       # Send output to SMF service log
  loglevel = info
  daemonize = 1
-
-@@ -9,12 +9,13 @@ daemonize = 1
+ 
+@@ -9,12 +10,13 @@
  securityprovider = psk
  plugin.psk = unset
-
+ 
 -connector = activemq
 -plugin.activemq.pool.size = 1
 -plugin.activemq.pool.1.host = stomp1
@@ -33,6 +34,6 @@
 +plugin.rabbitmq.pool.1.port = 61613
 +plugin.rabbitmq.pool.1.user = mcollective
 +plugin.rabbitmq.pool.1.password = changeme
-
+ 
  # Facts
  factsource = yaml