components/ruby/mcollective/patches/02-mco-server-config.patch
author Patrick Einheber <patrick.einheber@oracle.com>
Thu, 22 Sep 2016 07:45:05 -0700
changeset 6958 864721a3146f
parent 6665 9dbe2f1926b4
permissions -rw-r--r--
23019017 clone archives should remove sensitive puppet configuration data 23606517 mcollective default psk setting should be changeme
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5323
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
     1
Changes needed in server.cfg, mainly :
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
     2
    Making use of RabbitMQ (default is ActiveMQ)
5749
194929aecdf7 23076287 server and client.cfg logfile entry is not quite right
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents: 5513
diff changeset
     3
    The default port used to connect to RabbitMQ is 61613
5323
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
     4
    Default user : 'mcollective' & passwd : 'changeme'
5749
194929aecdf7 23076287 server and client.cfg logfile entry is not quite right
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents: 5513
diff changeset
     5
    Change RabbitMQ to log to /dev/stderr, so it goes to the SMF log
6958
864721a3146f 23019017 clone archives should remove sensitive puppet configuration data
Patrick Einheber <patrick.einheber@oracle.com>
parents: 6665
diff changeset
     6
    Set the PSK type explicitly to UID and the default to 'changeme'
5323
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
     7
6958
864721a3146f 23019017 clone archives should remove sensitive puppet configuration data
Patrick Einheber <patrick.einheber@oracle.com>
parents: 6665
diff changeset
     8
--- marionette-collective-2.8.8/etc/server.cfg.dist.orig	2016-09-19 08:51:05.719526817 -0700
864721a3146f 23019017 clone archives should remove sensitive puppet configuration data
Patrick Einheber <patrick.einheber@oracle.com>
parents: 6665
diff changeset
     9
+++ marionette-collective-2.8.8/etc/server.cfg.dist	2016-09-19 08:51:49.506159302 -0700
864721a3146f 23019017 clone archives should remove sensitive puppet configuration data
Patrick Einheber <patrick.einheber@oracle.com>
parents: 6665
diff changeset
    10
@@ -1,20 +1,28 @@
5860
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5749
diff changeset
    11
+#######################################################################
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5749
diff changeset
    12
+# Oracle has modified the originally distributed contents of this file.
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5749
diff changeset
    13
+#######################################################################
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5749
diff changeset
    14
+
5323
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    15
 main_collective = mcollective
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    16
 collectives = mcollective
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    17
-libdir = /usr/libexec/mcollective
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    18
-logfile = /var/log/mcollective.log
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    19
+libdir = /usr/share/mcollective
5513
a25ccbe6d0ea 22649883 mcollective client.cfg and server.cfg should log to SMF service log
Matt Keenan <matt.keenan@oracle.com>
parents: 5323
diff changeset
    20
+logger_type = file
5749
194929aecdf7 23076287 server and client.cfg logfile entry is not quite right
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents: 5513
diff changeset
    21
+# Send output to SMF service log
194929aecdf7 23076287 server and client.cfg logfile entry is not quite right
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents: 5513
diff changeset
    22
+logfile = /dev/stderr
5323
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    23
 loglevel = info
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    24
 daemonize = 1
5513
a25ccbe6d0ea 22649883 mcollective client.cfg and server.cfg should log to SMF service log
Matt Keenan <matt.keenan@oracle.com>
parents: 5323
diff changeset
    25
 
6958
864721a3146f 23019017 clone archives should remove sensitive puppet configuration data
Patrick Einheber <patrick.einheber@oracle.com>
parents: 6665
diff changeset
    26
 # Plugins
5323
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    27
 securityprovider = psk
6958
864721a3146f 23019017 clone archives should remove sensitive puppet configuration data
Patrick Einheber <patrick.einheber@oracle.com>
parents: 6665
diff changeset
    28
-plugin.psk = unset
864721a3146f 23019017 clone archives should remove sensitive puppet configuration data
Patrick Einheber <patrick.einheber@oracle.com>
parents: 6665
diff changeset
    29
+plugin.psk = changeme
864721a3146f 23019017 clone archives should remove sensitive puppet configuration data
Patrick Einheber <patrick.einheber@oracle.com>
parents: 6665
diff changeset
    30
+plugin.psk.callertype = uid
5513
a25ccbe6d0ea 22649883 mcollective client.cfg and server.cfg should log to SMF service log
Matt Keenan <matt.keenan@oracle.com>
parents: 5323
diff changeset
    31
 
5323
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    32
-connector = activemq
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    33
-plugin.activemq.pool.size = 1
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    34
-plugin.activemq.pool.1.host = stomp1
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    35
-plugin.activemq.pool.1.port = 6163
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    36
-plugin.activemq.pool.1.user = mcollective
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    37
-plugin.activemq.pool.1.password = marionette
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    38
+connector = rabbitmq
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    39
+plugin.rabbitmq.vhost = /mco
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    40
+plugin.rabbitmq.pool.size = 1
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    41
+plugin.rabbitmq.pool.1.host = localhost
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    42
+plugin.rabbitmq.pool.1.port = 61613
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    43
+plugin.rabbitmq.pool.1.user = mcollective
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    44
+plugin.rabbitmq.pool.1.password = changeme
5513
a25ccbe6d0ea 22649883 mcollective client.cfg and server.cfg should log to SMF service log
Matt Keenan <matt.keenan@oracle.com>
parents: 5323
diff changeset
    45
 
5323
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    46
 # Facts
4aa2cfbd75bb PSARC/2015/290 Stomp plugin for Ruby
saurabh.vyas@oracle.com
parents:
diff changeset
    47
 factsource = yaml