Update code from https://github.com/dmi-try/marionette-collective

[packages/precise/mcollective.git] / website / reference / basic / configuration.md

diff --git a/website/reference/basic/configuration.md b/website/reference/basic/configuration.md
index 7d79b1ae37f64f569c8ba16da174a48293bc7cca..54a9a9bc0cf8c6dcf2a2b6769e9e4833fa7084f9 100644 (file)
--- a/website/reference/basic/configuration.md
+++ b/website/reference/basic/configuration.md
@@ -9,6 +9,9 @@ title: Configuration Guide
 [Auditing]: /mcollective/simplerpc/auditing.html
 [Authorization]: /mcollective/simplerpc/authorization.html
 [Subcollectives]: /mcollective/reference/basic/subcollectives.html
+[server_config]: /mcollective/configure/server.html
+
+> **Note:** There is a new [Server Configuration Reference][server_config] page with a more complete overview of MCollective's server daemon settings. A similar client configuration page is forthcoming.
 
 This guide tells you about the major configuration options in the daemon and client config files.  There are options not mentioned
 here typically ones specific to a certain plugin.
@@ -22,9 +25,6 @@ Configuration is a simple *key = val* style configuration file.
 
 |Key|Sample|Description|
 |---|------|-----------|
-|topicprefix|/topic/|Prefix that gets used for all messages.|
-|queueprefix|/queue/|Prefix that gets used for all queued messages.|
-|topicsep|.|The seperator to use between parts of the topic path|
 |collectives|mcollective,subcollective|A list of [Subcollectives] to join - 1.1.3 and newer only|
 |main_collective|mcollective|The main collective to target - 1.1.3 and newer only|
 |logfile|/var/log/mcollective.log|Where to log|
@@ -33,7 +33,7 @@ Configuration is a simple *key = val* style configuration file.
 |keeplogs|5|The amount of logs to keep|
 |max_log_size|2097152|Max size in bytes for log files before rotation happens|
 |libdir|/usr/libexec/mcollective:/site/mcollective|Where to look for plugins|
-|connector|Stomp|Which _connector_ plugin to use for communication|
+|connector|activemq|Which _connector_ plugin to use for communication|
 |securityprovider|Psk|Which security model to use, see [SSL Security Plugin][SSLSecurity] and [AES Security Plugin][AESSecurity] for details on others|
 |rpchelptemplate|/etc/mcollective/rpc-help.erb|The path to the erb template used for generating help|
 |helptemplatedir|/etc/mcollective|The path that contains all the erb templates for generating help|
@@ -63,7 +63,6 @@ The server configuration file should be root only readable
 |rpcauthprovider|action_policy|Use the _MCollective::Util::ActionPolicy_ plugin to manage authorization|
 |rpclimitmethod|The method used for --limit-results.  Can be either _first_ or _random_|
 |fact_cache_time|300|How long to cache fact results for before refreshing from source|
-|plugin.discovery.timeout|10|Sets the timeout for the discovery agent, useful if facts are very slow|
 
 The last example sets a option for the _discovery_ plugin, you can also set this in _/etc/mcollective/plugin.d/discovery.cfg_, in that case
 you'd just set _timeout=10_ in the file.
@@ -88,10 +87,6 @@ Common plugin options are:
 
 |Key|Sample|Description|
 |---|------|-----------|
-|plugin.stomp.host|stomp.your.com|Host to connect too|
-|plugin.stomp.port|6163|Port to connecto too|
-|plugin.stomp.user|mcollective|User to connect as|
-|plugin.stomp.password|password|Password to use|
 |plugin.yaml|/etc/mcollective/facts.yaml:/other/facts.yaml|Where the yaml fact source finds facts from, multiples get merged|
 |plugin.psk|123456789|The pre-shared key to use for the Psk security provider|
 |plugin.psk.callertype|group|What to base the callerid on for the PSK plugin, uid, gid, user, group or identity|
@@ -106,7 +101,6 @@ You can set various Environment variables per user to supply these values:
 {% highlight bash %}
 export STOMP_USER=user
 export STOMP_PASSWORD=password
-export STOMP_SERVER=stomp.your.com
 export MCOLLECTIVE_PSK=123456789
 {% endhighlight %}