Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
cleanup.
  • Loading branch information
specialunderwear committed May 20, 2014
1 parent 8e6e271 commit a9d9af3
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions templates/client.cfg.erb
@@ -1,7 +1,7 @@
topicprefix = /topic/
main_collective = mcollective
collectives = mcollective,<%= collectives.join(',') %>
libdir = <%= mcollective_libdir %>
collectives = mcollective,<%= @collectives.join(',') %>
libdir = <%= @mcollective_libdir %>
logger_type = console
loglevel = warn

Expand All @@ -13,10 +13,10 @@ connector = rabbitmq

plugin.rabbitmq.vhost = /mcollective
plugin.rabbitmq.pool.size = 1
plugin.rabbitmq.pool.1.host = <%= stomp_host.nil? ? "localhost" : stomp_host %>
plugin.rabbitmq.pool.1.port = <%= stomp_port.nil? ? 6163 : stomp_port %>
plugin.rabbitmq.pool.1.user = <%= stomp_user.nil? ? "mcollective" : stomp_user %>
plugin.rabbitmq.pool.1.password = <%= stomp_password.nil? ? "pleasechangeme" : stomp_password %>
plugin.rabbitmq.pool.1.host = <%= @stomp_host.nil? ? "localhost" : @stomp_host %>
plugin.rabbitmq.pool.1.port = <%= @stomp_port.nil? ? 6163 : @stomp_port %>
plugin.rabbitmq.pool.1.user = <%= @stomp_user.nil? ? "mcollective" : @stomp_user %>
plugin.rabbitmq.pool.1.password = <%= @stomp_password.nil? ? "pleasechangeme" : @stomp_password %>

# Facts
factsource = yaml
Expand Down
10 changes: 5 additions & 5 deletions templates/server.cfg.erb
@@ -1,7 +1,7 @@
topicprefix = /topic/
main_collective = <%= @environment %>
collectives = mcollective,<%= @environment %>
libdir = <%= mcollective_libdir %>
libdir = <%= @mcollective_libdir %>
logfile = /var/log/mcollective.log
loglevel = info
daemonize = 1
Expand All @@ -14,10 +14,10 @@ connector = rabbitmq

plugin.rabbitmq.vhost = /mcollective
plugin.rabbitmq.pool.size = 1
plugin.rabbitmq.pool.1.host = <%= stomp_host.nil? ? "localhost" : stomp_host %>
plugin.rabbitmq.pool.1.port = <%= stomp_port.nil? ? 6163 : stomp_port %>
plugin.rabbitmq.pool.1.user = <%= stomp_user.nil? ? "mcollective" : stomp_user %>
plugin.rabbitmq.pool.1.password = <%= stomp_password.nil? ? "pleasechangeme" : stomp_password %>
plugin.rabbitmq.pool.1.host = <%= @stomp_host.nil? ? "localhost" : @stomp_host %>
plugin.rabbitmq.pool.1.port = <%= @stomp_port.nil? ? 6163 : @stomp_port %>
plugin.rabbitmq.pool.1.user = <%= @stomp_user.nil? ? "mcollective" : @stomp_user %>
plugin.rabbitmq.pool.1.password = <%= @stomp_password.nil? ? "pleasechangeme" : @stomp_password %>

# Facts
factsource = yaml
Expand Down

0 comments on commit a9d9af3

Please sign in to comment.