Merge pull request #52 from 2600hz/more-defs-4.1

allow configuration of presence amqp publish

kamailio/defs.cfg

@@ -83,4 +83,8 @@
 #!endif
 #!endif
 
+#!ifndef PRESENCE_AMQP_PUBLISH
+#!define PRESENCE_AMQP_PUBLISH 1
+#!endif
+
 # vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab

kamailio/presence-role.cfg

@@ -53,7 +53,7 @@ modparam("nat_traversal", "keepalive_state_file", "KAZOO_DATA_DIR/keep_alive_sta
 modparam("nat_traversal", "keepalive_interval", 45)
 #!endif
 
-kazoo.presence_sync_amqp = 0 descr "sync subscriptions to amqp"
+kazoo.presence_sync_amqp = PRESENCE_AMQP_PUBLISH descr "sync subscriptions to amqp"
 
 #!ifdef FAST_PICKUP_ROLE
 #!include_file "fast-pickup-role.cfg"
@@ -348,7 +348,7 @@ route[PRESENCE_BINDINGS]
    $var(payload) = "{ 'exchange' : 'presence', 'type' : 'topic', 'queue' : 'presence-presence-MY_HOSTNAME', 'routing' : 'update.*.*', 'exclusive' : 0, 'federate' : 1 }";
    kazoo_subscribe("$var(payload)");
 
-   $var(payload) = "{ 'exchange' : 'presence', 'type' : 'topic', 'queue' : 'presence-mwi-MY_HOSTNAME', 'routing' : 'mwi_updates.*', 'exclusive' : 0 , 'federate' : 1 }";
+   $var(payload) = "{ 'exchange' : 'presence', 'type' : 'topic', 'queue' : 'presence-mwi-MY_HOSTNAME', 'routing' : 'mwi_updates.*.*', 'exclusive' : 0 , 'federate' : 1 }";
    kazoo_subscribe("$var(payload)");
    #!endif