develop
diff --git a/heka/files/output/amqp.toml b/heka/files/output/amqp.toml
index 14ac661..ef61d57 100644
--- a/heka/files/output/amqp.toml
+++ b/heka/files/output/amqp.toml
@@ -1,10 +1,10 @@
{%- from "heka/map.jinja" import server with context -%}
[AMQPOutput_{{ name }}]
type = "AMQPOutput"
-url = "amqp://guest:guest@10.0.102.11/"
-exchange = "logs"
+url = "amqp://{{ values['user'] }}:{{ values['password'] }}@{{ values['host'] }}/"
+exchange = {{ values['exchange'] }}
exchange_type = "fanout"
-message_matcher = "TRUE"
+message_matcher = "{{ values['message_matcher'] }}"
use_framing = true
encoder = "ProtobufEncoder"
@@ -13,5 +13,3 @@
delay = "250ms"
max_retries = 5
-{{ values['exchange'] }}
-