From cff16eb6c680e7b113f7dc5ead51f798d92538bf Mon Sep 17 00:00:00 2001 From: lazedo Date: Wed, 16 Jan 2019 18:03:37 +0000 Subject: [PATCH] better defaults for ip and hostname --- kamailio/default.cfg | 6 ------ kamailio/defs.cfg | 19 ++++++++++++++----- kamailio/kamailio.cfg | 14 ++++++++++++++ kamailio/kazoo-bindings.cfg | 14 -------------- kamailio/local.cfg | 23 ++++++++--------------- kamailio/sip_trace-role.cfg | 2 +- 6 files changed, 37 insertions(+), 41 deletions(-) diff --git a/kamailio/default.cfg b/kamailio/default.cfg index 4e677f5..965f03f 100644 --- a/kamailio/default.cfg +++ b/kamailio/default.cfg @@ -105,9 +105,6 @@ loadmodule "stun.so" ######## Kamailio path module ######## loadmodule "path.so" -######## Kamailio ipops module ######## -loadmodule "ipops.so" - ######## Kamailio control connector module ######## loadmodule "ctl.so" modparam("ctl", "binrpc_buffer_size", 4096) @@ -166,9 +163,6 @@ loadmodule "htable.so" modparam("htable", "htable", "associations=>size=16;autoexpire=7200") modparam("htable", "htable", "redirects=>size=16;autoexpire=5") -######## Pseudo-Variables module ######## -loadmodule "pv.so" - ####### RTIMER module ########## loadmodule "rtimer.so" diff --git a/kamailio/defs.cfg b/kamailio/defs.cfg index 56e0900..d0991e4 100644 --- a/kamailio/defs.cfg +++ b/kamailio/defs.cfg @@ -3,6 +3,18 @@ ####### defs ######## +#!ifndef MY_HOSTNAME +#!substdef "!MY_HOSTNAME!$HN(f)!g" +#!endif + +#!ifndef MY_HOSTNAME +#!substdef "!MY_IP_ADDRESS!$HN(i)!g" +#!endif + +#!ifndef MY_HOSTNAME +#!substdef "!MY_WEBSOCKET_DOMAIN!$HN(d)!g" +#!endif + #!trydef KAZOO_LOG_LEVEL L_INFO #!ifndef KAMAILIO_DBMS @@ -69,11 +81,8 @@ #!trydef KZ_TRACE_INTERNAL_OUTGOING 1 #!trydef KZ_TRACE_EXTERNAL_INCOMING 1 #!trydef KZ_TRACE_EXTERNAL_OUTGOING 1 -#!ifndef SIP_TRACE_URI -#!substdef "!SIP_TRACE_URI!sip:127.0.0.1:9060!g" -#!endif -#!ifndef HEP_CAPTURE_ID -#!substdef "!HEP_CAPTURE_ID!1!g" +#!trydef SIP_TRACE_URI "sip:127.0.0.1:9060" +#!trydef HEP_CAPTURE_ID 1 #!endif #!endif diff --git a/kamailio/kamailio.cfg b/kamailio/kamailio.cfg index 2528128..bf27b31 100644 --- a/kamailio/kamailio.cfg +++ b/kamailio/kamailio.cfg @@ -23,6 +23,20 @@ #!define FLB_UAC_REDIRECT 3 #!define TRUSTED_ADR_GROUP 1 +################ +# Kamailio modules to help substdef setup +# these need to go before local.cfg +# so they can be used +# +# ipops - ip , domain, hostname +# pv - $def(existing definition) +# +# +################ +loadmodule "ipops.so" +loadmodule "pv.so" + + ####### Local Configuration ######## include_file "local.cfg" diff --git a/kamailio/kazoo-bindings.cfg b/kamailio/kazoo-bindings.cfg index cb3e7eb..7de1665 100644 --- a/kamailio/kazoo-bindings.cfg +++ b/kamailio/kazoo-bindings.cfg @@ -1,18 +1,4 @@ ######## kazoo bindings ######## -### use this simple form of binding a listener -### kazoo_subscribe("dialoginfo", "direct", "BLF-QUEUE-MY_HOSTNAME", "BLF-MY_HOSTNAME"); -### -### or unleash the power of rabbit to kazoo-blf -### -### 'no_ack' : 1 => needs ack, -### 'wait_for_consumer_ack' -### : 1 => when it receives, it processses on the AMQP Worker ad after that it confirms -### : 0 => when it receives, it acks then processes in the AMQP Worker -### only works if no_ack : 0 -### -### Rabbit Policy for ha-mode -### pattern : ^BLF -### definition : ha-mode: all ### ### diff --git a/kamailio/local.cfg b/kamailio/local.cfg index 8981287..24ea1a2 100644 --- a/kamailio/local.cfg +++ b/kamailio/local.cfg @@ -27,14 +27,14 @@ ################################################################################ ## SERVER INFORMATION ################################################################################ -## CHANGE "kamailio.2600hz.com" TO YOUR SERVERS HOSTNAME -#!substdef "!MY_HOSTNAME!kamailio.2600hz.com!g" +## UNCOMMENT & CHANGE "kamailio.2600hz.com" TO YOUR SERVERS HOSTNAME +# # #!substdef "!MY_HOSTNAME!kamailio.2600hz.com!g" -## CHANGE "127.0.0.1" TO YOUR SERVERS IP ADDRESS +## UNCOMMENT & CHANGE "127.0.0.1" TO YOUR SERVERS IP ADDRESS ## Usually your public IP. If you need ## to listen on addtional ports or IPs ## add them in "BINDINGS" at the bottom. -#!substdef "!MY_IP_ADDRESS!0.0.0.0!g" +# # #!substdef "!MY_IP_ADDRESS!127.0.0.1!g" ## CHANGE "kazoo://guest:guest@127.0.0.1:5672" TO THE AMQP URL ## This should be the primary RabbitMQ server @@ -46,7 +46,7 @@ ## Origin header on a new websocket request ## or it will be rejected. If you remove ## it completely the validation will be disabled. -#!substdef "!MY_WEBSOCKET_DOMAIN!2600hz.com!g" +# # #!substdef "!MY_WEBSOCKET_DOMAIN!2600hz.com!g" ################################################################################ ## DATABASE @@ -107,22 +107,15 @@ ##!define KZ_UDP_REGISTRAR_PORT 7000 ##!define KZ_TCP_REGISTRAR_PORT 7000 -################################################################################ -## NAT -################################################################################ -## These parameters are OPTIONAL. -## It allows overriding the nat_uac_test for port / contact with different values -# # #!trydef KZ_NAT_CONTACT_DETECT "1" -# # #!trydef KZ_NAT_PORT_DETECT "2" - ################################################################################ ## SIP traffic mirroring to SIP_TRACE server ################################################################################ ## This parameter is OPTIONAL. ## If you have installed SIP_TRACE server (Homer as example), ## then you can mirror INVITE and MESSAGE here -# # #!substdef "!SIP_TRACE_URI!sip:127.0.0.1:9060!g" -# # #!substdef "!HEP_CAPTURE_ID!1!g" +# # #!define SIP_TRACE_URI "sip:127.0.0.1:9060" +# # #!define HEP_CAPTURE_ID 1 + ## YOU SHOULD NOT HAVE TO CHANGE THESE! ## By setting MY_IP_ADDRESS above these will resolve diff --git a/kamailio/sip_trace-role.cfg b/kamailio/sip_trace-role.cfg index 7508567..cbd286a 100644 --- a/kamailio/sip_trace-role.cfg +++ b/kamailio/sip_trace-role.cfg @@ -15,7 +15,7 @@ kazoo.trace_external_outgoing = KZ_TRACE_EXTERNAL_OUTGOING descr "traces the out ####### Siptrace module ########## loadmodule "siptrace.so" -modparam("siptrace", "duplicate_uri", "SIP_TRACE_URI") +modparam("siptrace", "duplicate_uri", SIP_TRACE_URI) modparam("siptrace", "hep_mode_on", 1) modparam("siptrace", "hep_version", 3) modparam("siptrace", "hep_capture_id", HEP_CAPTURE_ID)