X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fpubsub%2Fpubsub.conf.erb;h=63eaf80cda29a4391c8e6a960970f271f36d8248;hb=3193d5e3eda80ee925e88997155a298dc6db81bc;hp=cf705de03706c9d1eb486d382cf5396647ff071e;hpb=3dee08de9e67bc4ed53db2180b32c3b4b436be1a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/pubsub/pubsub.conf.erb b/modules/roles/templates/pubsub/pubsub.conf.erb
index cf705de03..63eaf80cd 100644
--- a/modules/roles/templates/pubsub/pubsub.conf.erb
+++ b/modules/roles/templates/pubsub/pubsub.conf.erb
@@ -1,14 +1,10 @@
-[dsa-homedirs]
-vhost=dsa
-topic=dsa.git.homedirs
-exchange=dsa
-username=<%= @fqdn %>
-password=<%= @rabbit_password %>
+[<%= @key -%>]
+vhost=<%= @vhost %>
+topic=<%= @topic %>
+exchange=<%= @exchange %>
+username=<%= @username %>
+password=<%= @password %>
+<% if @queue -%>
+queue=<%= @queue %>
+<% end -%>
 
-[dsa-udreplicate]
-vhost=dsa
-topic=dsa.ud.replicate
-exchange=dsa
-username=<%= @fqdn %>
-password=<%= @rabbit_password %>
-queue=ud-<%= @fqdn %>