Skip to content
Permalink
Browse files Browse the repository at this point in the history
Merge pull request #89 from linuxmaniac/vseva/defaults
set defaults of fifo and ctl to /var/run/kamailio

Closes: #48
Closes: #89
  • Loading branch information
linuxmaniac committed Apr 16, 2015
2 parents 6e26044 + 6909de0 commit 06177b1
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 8 deletions.
4 changes: 3 additions & 1 deletion etc/kamailio-basic.cfg
Expand Up @@ -191,8 +191,10 @@ loadmodule "debugger.so"


# ----- mi_fifo params -----
modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo")

# ----- ctl params -----
modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl")

# ----- tm params -----
# auto-discard branches from previous serial forking leg
Expand Down
4 changes: 3 additions & 1 deletion etc/kamailio-oob.cfg
Expand Up @@ -315,8 +315,10 @@ loadmodule "xhttp_pi.so"


# ----- mi_fifo params -----
modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo")

# ----- ctl params -----
modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl")

# ----- tm params -----
# auto-discard branches from previous serial forking leg
Expand Down
4 changes: 3 additions & 1 deletion etc/kamailio.cfg
Expand Up @@ -288,8 +288,10 @@ loadmodule "debugger.so"


# ----- mi_fifo params -----
modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo")

# ----- ctl params -----
modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl")

# ----- tm params -----
# auto-discard branches from previous serial forking leg
Expand Down
4 changes: 2 additions & 2 deletions modules/ctl/ctl_defaults.h
Expand Up @@ -4,10 +4,10 @@
/*listen by default on: */
#ifdef SRNAME
/* this is used when compiling sercmd tool */
#define DEFAULT_CTL_SOCKET "unixs:/tmp/" SRNAME "_ctl"
#define DEFAULT_CTL_SOCKET "unixs:" RUN_DIR "/" SRNAME "/" SRNAME "_ctl"
#else
/* this is used when compiling sip server */
#define DEFAULT_CTL_SOCKET "unixs:/tmp/" NAME "_ctl"
#define DEFAULT_CTL_SOCKET "unixs:" RUN_DIR "/" NAME "_ctl"
#endif
/* port used by default for tcp/udp if no port is explicitely specified */
#define DEFAULT_CTL_PORT 2049
Expand Down
2 changes: 1 addition & 1 deletion utils/kamctl/kamctl.fifo
Expand Up @@ -25,7 +25,7 @@ fi
#
if [ -z "$FIFOPATH" ]; then
if [ -z "$OSER_FIFO" ]; then
FIFOPATH=/tmp/kamailio_fifo
FIFOPATH=/var/run/kamailio/kamailio_fifo
else
FIFOPATH=$OSER_FIFO
fi
Expand Down
4 changes: 2 additions & 2 deletions utils/kamctl/kamctlrc
Expand Up @@ -124,7 +124,7 @@
# CTLENGINE="FIFO"

## path to FIFO file
# FIFOPATH="/tmp/kamailio_fifo"
# FIFOPATH="/var/run/kamailio/kamailio_fifo"

## check ACL names; default on (1); off (0)
# VERIFY_ACL=1
Expand All @@ -142,7 +142,7 @@

## Kamailio START Options
## PID file path - default is: /var/run/kamailio.pid
# PID_FILE=/var/run/kamailio.pid
# PID_FILE=/var/run/kamailio/kamailio.pid

## Extra start options - default is: not set
# example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64"
Expand Down

0 comments on commit 06177b1

Please sign in to comment.