From e280aab5edfcbbe2169ef5bee554cfe25d7f6888 Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Wed, 4 Jan 2017 15:47:54 +0100 Subject: [PATCH] etc: removed mi modules from config files --- etc/kamailio-basic.cfg | 11 +++++++---- etc/kamailio-oob.cfg | 19 ++++++++++++------- etc/kamailio.cfg | 13 +------------ 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/etc/kamailio-basic.cfg b/etc/kamailio-basic.cfg index f2eca5ecede..6da7aefe3ea 100644 --- a/etc/kamailio-basic.cfg +++ b/etc/kamailio-basic.cfg @@ -146,7 +146,7 @@ mpath="/usr/local/lib/kamailio/modules/" loadmodule "db_mysql.so" #!endif -loadmodule "mi_fifo.so" +loadmodule "jsonrpc.so" loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" @@ -163,7 +163,6 @@ loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" -loadmodule "mi_rpc.so" loadmodule "acc.so" #!ifdef WITH_AUTH @@ -190,8 +189,12 @@ loadmodule "debugger.so" # ----------------- setting module-specific parameters --------------- -# ----- mi_fifo params ----- -#modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") +# ----- jsonrpcs params ----- +modparam("jsonrpcs", "pretty_format", 1) +/* set the path to RPC fifo control file */ +# modparam("jsonrpcs", "fifo_name", "/var/run/kamailio/kamailio_rpc.fifo") +/* set the path to RPC unix socket control file */ +# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") # ----- ctl params ----- #modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") diff --git a/etc/kamailio-oob.cfg b/etc/kamailio-oob.cfg index 1f079580c21..6e097f0e244 100644 --- a/etc/kamailio-oob.cfg +++ b/etc/kamailio-oob.cfg @@ -1,6 +1,6 @@ #!KAMAILIO # -# Kamailio (OpenSER) SIP Server v4.3 - default configuration script +# Kamailio (OpenSER) SIP Server v5.0 - default configuration script # - web: http://www.kamailio.org # - git: http://sip-router.org # @@ -11,10 +11,10 @@ # # Several features can be enabled using '#!define WITH_FEATURE' directives: # -# *** To run in debug mode: +# *** To run in debug mode: # - define WITH_DEBUG # -# *** To enable mysql: +# *** To enable mysql: # - define WITH_MYSQL # # *** To enable authentication execute: @@ -232,7 +232,7 @@ mpath="/usr/local/lib/kamailio/modules/" loadmodule "db_mysql.so" #!endif -loadmodule "mi_fifo.so" +loadmodule "jsonrpcs.so" loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" @@ -249,7 +249,6 @@ loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" -loadmodule "mi_rpc.so" loadmodule "acc.so" #!ifdef WITH_AUTH @@ -314,12 +313,18 @@ loadmodule "xhttp_pi.so" # ----------------- setting module-specific parameters --------------- -# ----- mi_fifo params ----- -#modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") +# ----- jsonrpcs params ----- +modparam("jsonrpcs", "pretty_format", 1) +/* set the path to RPC fifo control file */ +# modparam("jsonrpcs", "fifo_name", "/var/run/kamailio/kamailio_rpc.fifo") +/* set the path to RPC unix socket control file */ +# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") + # ----- ctl params ----- #modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") + # ----- tm params ----- # auto-discard branches from previous serial forking leg modparam("tm", "failure_reply_mode", 3) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 0245f7ef5a5..8b4a1d35197 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -238,7 +238,6 @@ loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" -loadmodule "mi_rpc.so" loadmodule "acc.so" #!ifdef WITH_AUTH @@ -292,6 +291,7 @@ loadmodule "debugger.so" # ----- jsonrpcs params ----- +modparam("jsonrpcs", "pretty_format", 1) /* set the path to RPC fifo control file */ # modparam("jsonrpcs", "fifo_name", "/var/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ @@ -309,14 +309,12 @@ modparam("tm", "fr_timer", 30000) # default invite retransmission timeout after 1xx: 120sec modparam("tm", "fr_inv_timer", 120000) - # ----- rr params ----- # set next param to 1 to add value to ;lr param (helps with some UAs) modparam("rr", "enable_full_lr", 0) # do not append from tag to the RR (no need for this script) modparam("rr", "append_fromtag", 0) - # ----- registrar params ----- modparam("registrar", "method_filtering", 1) /* uncomment the next line to disable parallel forking via location */ @@ -328,7 +326,6 @@ modparam("registrar", "max_expires", 3600) /* set it to 1 to enable GRUU */ modparam("registrar", "gruu_enabled", 0) - # ----- acc params ----- /* what special events should be accounted ? */ modparam("acc", "early_media", 0) @@ -355,7 +352,6 @@ modparam("acc", "db_extra", "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") #!endif - # ----- usrloc params ----- /* enable DB persistency for location entries */ #!ifdef WITH_USRLOCDB @@ -364,7 +360,6 @@ modparam("usrloc", "db_mode", 2) modparam("usrloc", "use_domain", MULTIDOMAIN) #!endif - # ----- auth_db params ----- #!ifdef WITH_AUTH modparam("auth_db", "db_url", DBURL) @@ -381,21 +376,18 @@ modparam("permissions", "db_mode", 1) #!endif - # ----- alias_db params ----- #!ifdef WITH_ALIASDB modparam("alias_db", "db_url", DBURL) modparam("alias_db", "use_domain", MULTIDOMAIN) #!endif - # ----- speeddial params ----- #!ifdef WITH_SPEEDDIAL modparam("speeddial", "db_url", DBURL) modparam("speeddial", "use_domain", MULTIDOMAIN) #!endif - # ----- domain params ----- #!ifdef WITH_MULTIDOMAIN modparam("domain", "db_url", DBURL) @@ -403,7 +395,6 @@ modparam("domain", "db_url", DBURL) modparam("domain", "register_myself", 1) #!endif - #!ifdef WITH_PRESENCE # ----- presence params ----- modparam("presence", "db_url", DBURL) @@ -413,7 +404,6 @@ modparam("presence_xml", "db_url", DBURL) modparam("presence_xml", "force_active", 1) #!endif - #!ifdef WITH_NAT # ----- rtpproxy params ----- modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") @@ -429,7 +419,6 @@ modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") modparam("usrloc", "nat_bflag", FLB_NATB) #!endif - #!ifdef WITH_TLS # ----- tls params ----- modparam("tls", "config", "/usr/local/etc/kamailio/tls.cfg")