[sr-dev] git:master:06177b12: Merge pull request #89 from linuxmaniac/vseva/defaults

[Victor Seva]

Module: kamailio
Branch: master
Commit: 06177b12936146d48378cc5f6c6e1b157ebd519b
URL: https://github.com/kamailio/kamailio/commit/06177b12936146d48378cc5f6c6e1b157ebd519b

Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Committer: Victor Seva <linuxmaniac at torreviejawireless.org>
Date: 2015-04-16T11:58:23+02:00

Merge pull request #89 from linuxmaniac/vseva/defaults

set defaults of fifo and ctl to /var/run/kamailio

Closes: #48
Closes: #89

---

Modified: etc/kamailio-basic.cfg
Modified: etc/kamailio-oob.cfg
Modified: etc/kamailio.cfg
Modified: modules/ctl/ctl_defaults.h
Modified: utils/kamctl/kamctl.fifo
Modified: utils/kamctl/kamctlrc

---

Diff:  https://github.com/kamailio/kamailio/commit/06177b12936146d48378cc5f6c6e1b157ebd519b.diff
Patch: https://github.com/kamailio/kamailio/commit/06177b12936146d48378cc5f6c6e1b157ebd519b.patch

---

diff --git a/etc/kamailio-basic.cfg b/etc/kamailio-basic.cfg
index 17d7bcb..55685d5 100644
--- a/etc/kamailio-basic.cfg
+++ b/etc/kamailio-basic.cfg
@@ -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
diff --git a/etc/kamailio-oob.cfg b/etc/kamailio-oob.cfg
index 6a16763..db786d0 100644
--- a/etc/kamailio-oob.cfg
+++ b/etc/kamailio-oob.cfg
@@ -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
diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg
index 0644e6a..78f6ee1 100644
--- a/etc/kamailio.cfg
+++ b/etc/kamailio.cfg
@@ -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
diff --git a/modules/ctl/ctl_defaults.h b/modules/ctl/ctl_defaults.h
index 01b6680..10498e3 100644
--- a/modules/ctl/ctl_defaults.h
+++ b/modules/ctl/ctl_defaults.h
@@ -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
diff --git a/utils/kamctl/kamctl.fifo b/utils/kamctl/kamctl.fifo
index e57c7df..c94a5cc 100644
--- a/utils/kamctl/kamctl.fifo
+++ b/utils/kamctl/kamctl.fifo
@@ -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
diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc
index b8b241b..f96cab6 100644
--- a/utils/kamctl/kamctlrc
+++ b/utils/kamctl/kamctlrc
@@ -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
@@ -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"