diff --git a/doc/scripts/cdefs2doc/dump_cfg_defs.pl b/doc/scripts/cdefs2doc/dump_cfg_defs.pl index 918713c9cd0..b2b71c121b8 100755 --- a/doc/scripts/cdefs2doc/dump_cfg_defs.pl +++ b/doc/scripts/cdefs2doc/dump_cfg_defs.pl @@ -49,7 +49,7 @@ # gcc name my $gcc="gcc"; # default defines -my $c_defs="DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' -DOS='linux_' -DOS_QUOTED='\"linux\"' -DCOMPILER='\"gcc 4.9.2\"' -D__CPU_x86_64 -D__OS_linux -DSER_VER=5001000 -DCFG_DIR='\"/usr/local/etc/kamailio/\"' -DRUN_DIR='\"/var/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT"; +my $c_defs="DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' -DOS='linux_' -DOS_QUOTED='\"linux\"' -DCOMPILER='\"gcc 4.9.2\"' -D__CPU_x86_64 -D__OS_linux -DSER_VER=5001000 -DCFG_DIR='\"/usr/local/etc/kamailio/\"' -DRUN_DIR='\"/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT"; # file with gcc syntax tree my $file; #"tcp_options.c.001t.tu" ; diff --git a/doc/scripts/cdefs2doc/dump_counters.pl b/doc/scripts/cdefs2doc/dump_counters.pl index 55aee95cc09..76f2d5d95ee 100755 --- a/doc/scripts/cdefs2doc/dump_counters.pl +++ b/doc/scripts/cdefs2doc/dump_counters.pl @@ -39,7 +39,7 @@ # gcc name my $gcc="gcc"; # default defines -my $c_defs="DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' -DOS='linux_' -DOS_QUOTED='\"linux\"' -DCOMPILER='\"gcc 4.9.2\"' -D__CPU_x86_64 -D__OS_linux -DSER_VER=5001000 -DCFG_DIR='\"/usr/local/etc/kamailio/\"' -DRUN_DIR='\"/var/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT"; +my $c_defs="DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' -DOS='linux_' -DOS_QUOTED='\"linux\"' -DCOMPILER='\"gcc 4.9.2\"' -D__CPU_x86_64 -D__OS_linux -DSER_VER=5001000 -DCFG_DIR='\"/usr/local/etc/kamailio/\"' -DRUN_DIR='\"/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT"; # file with gcc syntax tree my $file; #"tcp_options.c.001t.tu" ; diff --git a/doc/scripts/cdefs2doc/dump_rpcs.pl b/doc/scripts/cdefs2doc/dump_rpcs.pl index f22a9edc1b1..ad7054aefa2 100755 --- a/doc/scripts/cdefs2doc/dump_rpcs.pl +++ b/doc/scripts/cdefs2doc/dump_rpcs.pl @@ -43,7 +43,7 @@ # gcc name my $gcc="gcc"; # default defines -my $c_defs="DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' -DOS='linux_' -DOS_QUOTED='\"linux\"' -DCOMPILER='\"gcc 4.9.2\"' -D__CPU_x86_64 -D__OS_linux -DSER_VER=5001000 -DCFG_DIR='\"/usr/local/etc/kamailio/\"' -DRUN_DIR='\"/var/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT"; +my $c_defs="DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' -DOS='linux_' -DOS_QUOTED='\"linux\"' -DCOMPILER='\"gcc 4.9.2\"' -D__CPU_x86_64 -D__OS_linux -DSER_VER=5001000 -DCFG_DIR='\"/usr/local/etc/kamailio/\"' -DRUN_DIR='\"/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT"; # file with gcc syntax tree my $file; diff --git a/doc/scripts/cdefs2doc/dump_selects.pl b/doc/scripts/cdefs2doc/dump_selects.pl index e05d1f43011..8ed5eef07e0 100755 --- a/doc/scripts/cdefs2doc/dump_selects.pl +++ b/doc/scripts/cdefs2doc/dump_selects.pl @@ -40,7 +40,7 @@ # gcc name my $gcc="gcc"; # default defines -my $c_defs="DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' -DOS='linux_' -DOS_QUOTED='\"linux\"' -DCOMPILER='\"gcc 4.9.2\"' -D__CPU_x86_64 -D__OS_linux -DSER_VER=5001000 -DCFG_DIR='\"/usr/local/etc/kamailio/\"' -DRUN_DIR='\"/var/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT"; +my $c_defs="DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' -DOS='linux_' -DOS_QUOTED='\"linux\"' -DCOMPILER='\"gcc 4.9.2\"' -D__CPU_x86_64 -D__OS_linux -DSER_VER=5001000 -DCFG_DIR='\"/usr/local/etc/kamailio/\"' -DRUN_DIR='\"/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT"; # file with gcc syntax tree my $file; diff --git a/doc/tutorials/cfg_list/Makefile b/doc/tutorials/cfg_list/Makefile index 0136463ee45..12f7c0105d3 100644 --- a/doc/tutorials/cfg_list/Makefile +++ b/doc/tutorials/cfg_list/Makefile @@ -69,7 +69,7 @@ c_defs=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \ -DOS='linux_' -DOS_QUOTED='\"linux\"' -DCOMPILER='\"gcc 4.9.2\"' \ -D__CPU_x86_64 -D__OS_linux -DSER_VER=5001000 \ -DCFG_DIR='\"/usr/local/etc/kamailio/\"' \ - -DRUN_DIR='\"/var/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP \ + -DRUN_DIR='\"/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP \ -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES \ -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR \ -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ diff --git a/doc/tutorials/counter_list/Makefile b/doc/tutorials/counter_list/Makefile index 5ba11598a34..83aab2e1b72 100644 --- a/doc/tutorials/counter_list/Makefile +++ b/doc/tutorials/counter_list/Makefile @@ -63,7 +63,7 @@ c_defs=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \ -DOS='linux_' -DOS_QUOTED='\"linux\"' -DCOMPILER='\"gcc 4.9.2\"' \ -D__CPU_x86_64 -D__OS_linux -DSER_VER=5001000 \ -DCFG_DIR='\"/usr/local/etc/kamailio/\"' \ - -DRUN_DIR='\"/var/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP \ + -DRUN_DIR='\"/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP \ -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES \ -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR \ -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ diff --git a/doc/tutorials/rpc_list/Makefile b/doc/tutorials/rpc_list/Makefile index e1050643652..61117d44eb0 100644 --- a/doc/tutorials/rpc_list/Makefile +++ b/doc/tutorials/rpc_list/Makefile @@ -136,7 +136,7 @@ c_defsX=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \ -DOS='linux_' -DOS_QUOTED='\"linux\"' -DCOMPILER='\"gcc 4.9.2\"' \ -D__CPU_x86_64 -D__OS_linux -DSER_VER=5001000 \ -DCFG_DIR='\"/usr/local/etc/kamailio/\"' \ - -DRUN_DIR='\"/var/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP \ + -DRUN_DIR='\"/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP \ -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES \ -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR \ -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ diff --git a/doc/tutorials/select_list/Makefile b/doc/tutorials/select_list/Makefile index 7a0f93de376..69587e4702e 100644 --- a/doc/tutorials/select_list/Makefile +++ b/doc/tutorials/select_list/Makefile @@ -65,7 +65,7 @@ c_defs=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \ -DOS='linux_' -DOS_QUOTED='\"linux\"' -DCOMPILER='\"gcc 4.9.2\"' \ -D__CPU_x86_64 -D__OS_linux -DSER_VER=5001000 \ -DCFG_DIR='\"/usr/local/etc/kamailio/\"' \ - -DRUN_DIR='\"/var/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP \ + -DRUN_DIR='\"/run/kamailio/\"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP \ -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES \ -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR \ -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC \ diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 24b9ac434e6..9047f49feff 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -302,13 +302,13 @@ 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") +# modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ -# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") +# modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") # ----- ctl params ----- /* set the path to RPC unix socket control file */ -# modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") +# modparam("ctl", "binrpc", "unix:/run/kamailio/kamailio_ctl") # ----- sanity params ----- modparam("sanity", "autodrop", 0) diff --git a/misc/examples/ims/icscf/kamailio.cfg b/misc/examples/ims/icscf/kamailio.cfg index c1a15fd947f..aa5d8d743c0 100644 --- a/misc/examples/ims/icscf/kamailio.cfg +++ b/misc/examples/ims/icscf/kamailio.cfg @@ -146,9 +146,9 @@ loadmodule "jsonrpcs.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") +# modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ -# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") +# modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") # -- rr params -- # add value to ;lr param to make some broken UAs happy @@ -192,7 +192,7 @@ modparam("xmlrpc", "url_match", "^/RPC") #!endif # ----- ctl params ----- -modparam("ctl", "binrpc", "unix:/var/run/kamailio_icscf/kamailio_ctl") +modparam("ctl", "binrpc", "unix:/run/kamailio_icscf/kamailio_ctl") #!ifdef WITH_DEBUG # ----- debugger params ----- diff --git a/misc/examples/ims/pcscf/kamailio.cfg b/misc/examples/ims/pcscf/kamailio.cfg index 0c3f65de773..3ffa779eafc 100644 --- a/misc/examples/ims/pcscf/kamailio.cfg +++ b/misc/examples/ims/pcscf/kamailio.cfg @@ -242,9 +242,9 @@ loadmodule "jsonrpcs.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") +# modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ -# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") +# modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") # ----------------- setting module-specific parameters --------------- #!ifdef DB_URL2 @@ -324,7 +324,7 @@ modparam("rtpengine", "extra_id_pv", "$avp(extra_id)") modparam("path", "use_received", 1) # ----- ctl params ----- -modparam("ctl", "binrpc", "unix:/var/run/kamailio_pcscf/kamailio_ctl") +modparam("ctl", "binrpc", "unix:/run/kamailio_pcscf/kamailio_ctl") # ----------------- Settings for Dispatcher --------------- modparam("dispatcher", "list_file", "/etc/kamailio_pcscf/dispatcher.list") diff --git a/misc/examples/ims/scscf/kamailio.cfg b/misc/examples/ims/scscf/kamailio.cfg index 0673ea057c5..da6e97242a6 100644 --- a/misc/examples/ims/scscf/kamailio.cfg +++ b/misc/examples/ims/scscf/kamailio.cfg @@ -190,12 +190,12 @@ loadmodule "jsonrpcs.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") +# modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ -# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") +# modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") # ----- ctl params ----- -modparam("ctl", "binrpc", "unix:/var/run/kamailio_scscf/kamailio_ctl") +modparam("ctl", "binrpc", "unix:/run/kamailio_scscf/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg diff --git a/misc/examples/kemi/kamailio-basic-kemi.cfg b/misc/examples/kemi/kamailio-basic-kemi.cfg index 9245056a806..d6859fb7d52 100644 --- a/misc/examples/kemi/kamailio-basic-kemi.cfg +++ b/misc/examples/kemi/kamailio-basic-kemi.cfg @@ -254,12 +254,12 @@ loadmodule "app_sqlang.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") +# modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ -# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") +# modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") # ----- ctl params ----- -#modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") +#modparam("ctl", "binrpc", "unix:/run/kamailio/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg diff --git a/misc/examples/mixed/kamailio-minimal-anycast.cfg b/misc/examples/mixed/kamailio-minimal-anycast.cfg index 0c7c6027f0a..cb4bc64646a 100644 --- a/misc/examples/mixed/kamailio-minimal-anycast.cfg +++ b/misc/examples/mixed/kamailio-minimal-anycast.cfg @@ -115,13 +115,13 @@ loadmodule "counters.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") +# modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ -# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") +# modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") # ----- ctl params ----- /* set the path to RPC unix socket control file */ -# modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") +# modparam("ctl", "binrpc", "unix:/run/kamailio/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg diff --git a/misc/examples/mixed/kamailio-minimal-proxy.cfg b/misc/examples/mixed/kamailio-minimal-proxy.cfg index 3d65fe85f23..c28efed97d0 100644 --- a/misc/examples/mixed/kamailio-minimal-proxy.cfg +++ b/misc/examples/mixed/kamailio-minimal-proxy.cfg @@ -89,13 +89,13 @@ loadmodule "counters.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") +# modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ -# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") +# modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") # ----- ctl params ----- /* set the path to RPC unix socket control file */ -# modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") +# modparam("ctl", "binrpc", "unix:/run/kamailio/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg diff --git a/misc/examples/pkg/kamailio-basic.cfg b/misc/examples/pkg/kamailio-basic.cfg index 0ae1b161348..48adcce0756 100644 --- a/misc/examples/pkg/kamailio-basic.cfg +++ b/misc/examples/pkg/kamailio-basic.cfg @@ -190,12 +190,12 @@ 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") +# modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ -# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") +# modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") # ----- ctl params ----- -#modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") +#modparam("ctl", "binrpc", "unix:/run/kamailio/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg diff --git a/misc/examples/pkg/kamailio-oob.cfg b/misc/examples/pkg/kamailio-oob.cfg index 0e0206643f7..3ec15420727 100644 --- a/misc/examples/pkg/kamailio-oob.cfg +++ b/misc/examples/pkg/kamailio-oob.cfg @@ -318,13 +318,13 @@ loadmodule "xhttp_pi.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") +# modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ -# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") +# modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") # ----- ctl params ----- -#modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") +#modparam("ctl", "binrpc", "unix:/run/kamailio/kamailio_ctl") # ----- tm params ----- diff --git a/misc/examples/scripts/sr b/misc/examples/scripts/sr index c950a807a02..bebe0c76bb1 100755 --- a/misc/examples/scripts/sr +++ b/misc/examples/scripts/sr @@ -23,7 +23,7 @@ BINNAME=sr HM=/home/srouter SERDIR=$HM/sip_router ETC=/etc/sip-router/iptel.cfg -PIDFILE=/var/run/sr.pid +PIDFILE=/run/sr.pid NOTIFY=sr@iptel.org USR=510 GRP=510 diff --git a/misc/examples/webrtc/kamailio-default-websocket.cfg b/misc/examples/webrtc/kamailio-default-websocket.cfg index cb6175c12eb..85eda170eae 100644 --- a/misc/examples/webrtc/kamailio-default-websocket.cfg +++ b/misc/examples/webrtc/kamailio-default-websocket.cfg @@ -312,13 +312,13 @@ loadmodule "websocket.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") +# modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ -# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") +# modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") # ----- ctl params ----- /* set the path to RPC unix socket control file */ -# modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") +# modparam("ctl", "binrpc", "unix:/run/kamailio/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 74a65662487..f2ce051ff35 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -290,7 +290,7 @@ prepare() { cd "$builddir" cd utils/kamctl/ - sed -i -e 's:/var/run/kamailio.pid:/var/run/kamailio/kamailio.pid:g' \ + sed -i -e 's:/run/kamailio.pid:/run/kamailio/kamailio.pid:g' \ kamctl.base kamctlrc || return 1 # we actually dont need bash sed -i -e 's:/bin/bash:/bin/sh:' kamctl kamdbctl \ @@ -318,7 +318,7 @@ package() { make FREERADIUS=1 -j1 install || return 1 install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname - install -d -o kamailio "$pkgdir"/var/run/kamailio + install -d -o kamailio "$pkgdir"/run/kamailio } _mv_mod() { diff --git a/pkg/kamailio/alpine/kamailio.initd b/pkg/kamailio/alpine/kamailio.initd index 6373932335d..9ec1938d6d9 100644 --- a/pkg/kamailio/alpine/kamailio.initd +++ b/pkg/kamailio/alpine/kamailio.initd @@ -1,7 +1,7 @@ #!/sbin/openrc-run daemon=/usr/sbin/kamailio -pidfile=/var/run/kamailio/kamailio.pid +pidfile=/run/kamailio/kamailio.pid extra_started_commands="reload" @@ -12,7 +12,7 @@ depend() { start() { ebegin "Starting Kamailio" - checkpath -d -o kamailio:kamailio /var/run/kamailio + checkpath -d -o kamailio:kamailio /run/kamailio start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon \ -- \ -u ${KAMAILIO_USER:-kamailio} \ diff --git a/pkg/kamailio/deb/bionic/kamailio.postinst b/pkg/kamailio/deb/bionic/kamailio.postinst index 4ee38ecb13c..e2777808b09 100644 --- a/pkg/kamailio/deb/bionic/kamailio.postinst +++ b/pkg/kamailio/deb/bionic/kamailio.postinst @@ -6,7 +6,7 @@ case "$1" in configure) adduser --quiet --system --group --disabled-password \ --shell /bin/false --gecos "Kamailio SIP Server" \ - --home /var/run/kamailio kamailio || true + --home /run/kamailio kamailio || true ;; diff --git a/pkg/kamailio/deb/bionic/rules b/pkg/kamailio/deb/bionic/rules index c8463fb8956..ebb9b21f348 100755 --- a/pkg/kamailio/deb/bionic/rules +++ b/pkg/kamailio/deb/bionic/rules @@ -164,7 +164,7 @@ install: build # install /etc/default/kamailio file mkdir -p $(CURDIR)/debian/kamailio/etc/default cp -f debian/kamailio.default $(CURDIR)/debian/kamailio/etc/default/kamailio - # delete /var/run/kamailio dir + # delete /run/kamailio dir rm -rf $(CURDIR)/debian/kamailio/usr/local diff --git a/pkg/kamailio/deb/buster/kamailio.postinst b/pkg/kamailio/deb/buster/kamailio.postinst index 4ee38ecb13c..e2777808b09 100644 --- a/pkg/kamailio/deb/buster/kamailio.postinst +++ b/pkg/kamailio/deb/buster/kamailio.postinst @@ -6,7 +6,7 @@ case "$1" in configure) adduser --quiet --system --group --disabled-password \ --shell /bin/false --gecos "Kamailio SIP Server" \ - --home /var/run/kamailio kamailio || true + --home /run/kamailio kamailio || true ;; diff --git a/pkg/kamailio/deb/buster/rules b/pkg/kamailio/deb/buster/rules index c8463fb8956..ebb9b21f348 100755 --- a/pkg/kamailio/deb/buster/rules +++ b/pkg/kamailio/deb/buster/rules @@ -164,7 +164,7 @@ install: build # install /etc/default/kamailio file mkdir -p $(CURDIR)/debian/kamailio/etc/default cp -f debian/kamailio.default $(CURDIR)/debian/kamailio/etc/default/kamailio - # delete /var/run/kamailio dir + # delete /run/kamailio dir rm -rf $(CURDIR)/debian/kamailio/usr/local diff --git a/pkg/kamailio/deb/debian/kamailio.postinst b/pkg/kamailio/deb/debian/kamailio.postinst index 4ee38ecb13c..e2777808b09 100644 --- a/pkg/kamailio/deb/debian/kamailio.postinst +++ b/pkg/kamailio/deb/debian/kamailio.postinst @@ -6,7 +6,7 @@ case "$1" in configure) adduser --quiet --system --group --disabled-password \ --shell /bin/false --gecos "Kamailio SIP Server" \ - --home /var/run/kamailio kamailio || true + --home /run/kamailio kamailio || true ;; diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index 6646d27f5f9..ed18676af5c 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -165,7 +165,7 @@ install: build # install /etc/default/kamailio file mkdir -p $(CURDIR)/debian/kamailio/etc/default cp -f debian/kamailio.default $(CURDIR)/debian/kamailio/etc/default/kamailio - # delete /var/run/kamailio dir + # delete /run/kamailio dir rm -rf $(CURDIR)/debian/kamailio/usr/local diff --git a/pkg/kamailio/deb/jessie/kamailio.postinst b/pkg/kamailio/deb/jessie/kamailio.postinst index 4ee38ecb13c..e2777808b09 100644 --- a/pkg/kamailio/deb/jessie/kamailio.postinst +++ b/pkg/kamailio/deb/jessie/kamailio.postinst @@ -6,7 +6,7 @@ case "$1" in configure) adduser --quiet --system --group --disabled-password \ --shell /bin/false --gecos "Kamailio SIP Server" \ - --home /var/run/kamailio kamailio || true + --home /run/kamailio kamailio || true ;; diff --git a/pkg/kamailio/deb/jessie/rules b/pkg/kamailio/deb/jessie/rules index 6f68bfc7ef9..ec4aef66e0f 100755 --- a/pkg/kamailio/deb/jessie/rules +++ b/pkg/kamailio/deb/jessie/rules @@ -165,7 +165,7 @@ install: build # install /etc/default/kamailio file mkdir -p $(CURDIR)/debian/kamailio/etc/default cp -f debian/kamailio.default $(CURDIR)/debian/kamailio/etc/default/kamailio - # delete /var/run/kamailio dir + # delete /run/kamailio dir rm -rf $(CURDIR)/debian/kamailio/usr/local diff --git a/pkg/kamailio/deb/precise/kamailio.postinst b/pkg/kamailio/deb/precise/kamailio.postinst index 4ee38ecb13c..e2777808b09 100644 --- a/pkg/kamailio/deb/precise/kamailio.postinst +++ b/pkg/kamailio/deb/precise/kamailio.postinst @@ -6,7 +6,7 @@ case "$1" in configure) adduser --quiet --system --group --disabled-password \ --shell /bin/false --gecos "Kamailio SIP Server" \ - --home /var/run/kamailio kamailio || true + --home /run/kamailio kamailio || true ;; diff --git a/pkg/kamailio/deb/precise/rules b/pkg/kamailio/deb/precise/rules index a6eda06ad67..f6422f44eb3 100755 --- a/pkg/kamailio/deb/precise/rules +++ b/pkg/kamailio/deb/precise/rules @@ -164,7 +164,7 @@ install: build # install /etc/default/kamailio file mkdir -p $(CURDIR)/debian/kamailio/etc/default cp -f debian/kamailio.default $(CURDIR)/debian/kamailio/etc/default/kamailio - # delete /var/run/kamailio dir + # delete /run/kamailio dir rm -rf $(CURDIR)/debian/kamailio/usr/local diff --git a/pkg/kamailio/deb/sid/kamailio.postinst b/pkg/kamailio/deb/sid/kamailio.postinst index 4ee38ecb13c..e2777808b09 100644 --- a/pkg/kamailio/deb/sid/kamailio.postinst +++ b/pkg/kamailio/deb/sid/kamailio.postinst @@ -6,7 +6,7 @@ case "$1" in configure) adduser --quiet --system --group --disabled-password \ --shell /bin/false --gecos "Kamailio SIP Server" \ - --home /var/run/kamailio kamailio || true + --home /run/kamailio kamailio || true ;; diff --git a/pkg/kamailio/deb/sid/rules b/pkg/kamailio/deb/sid/rules index c8463fb8956..ebb9b21f348 100755 --- a/pkg/kamailio/deb/sid/rules +++ b/pkg/kamailio/deb/sid/rules @@ -164,7 +164,7 @@ install: build # install /etc/default/kamailio file mkdir -p $(CURDIR)/debian/kamailio/etc/default cp -f debian/kamailio.default $(CURDIR)/debian/kamailio/etc/default/kamailio - # delete /var/run/kamailio dir + # delete /run/kamailio dir rm -rf $(CURDIR)/debian/kamailio/usr/local diff --git a/pkg/kamailio/deb/stretch/kamailio.postinst b/pkg/kamailio/deb/stretch/kamailio.postinst index 4ee38ecb13c..e2777808b09 100644 --- a/pkg/kamailio/deb/stretch/kamailio.postinst +++ b/pkg/kamailio/deb/stretch/kamailio.postinst @@ -6,7 +6,7 @@ case "$1" in configure) adduser --quiet --system --group --disabled-password \ --shell /bin/false --gecos "Kamailio SIP Server" \ - --home /var/run/kamailio kamailio || true + --home /run/kamailio kamailio || true ;; diff --git a/pkg/kamailio/deb/stretch/rules b/pkg/kamailio/deb/stretch/rules index 80dec6db51c..15bd7b8ec6a 100755 --- a/pkg/kamailio/deb/stretch/rules +++ b/pkg/kamailio/deb/stretch/rules @@ -165,7 +165,7 @@ install: build # install /etc/default/kamailio file mkdir -p $(CURDIR)/debian/kamailio/etc/default cp -f debian/kamailio.default $(CURDIR)/debian/kamailio/etc/default/kamailio - # delete /var/run/kamailio dir + # delete /run/kamailio dir rm -rf $(CURDIR)/debian/kamailio/usr/local diff --git a/pkg/kamailio/deb/trusty/kamailio.postinst b/pkg/kamailio/deb/trusty/kamailio.postinst index 4ee38ecb13c..e2777808b09 100644 --- a/pkg/kamailio/deb/trusty/kamailio.postinst +++ b/pkg/kamailio/deb/trusty/kamailio.postinst @@ -6,7 +6,7 @@ case "$1" in configure) adduser --quiet --system --group --disabled-password \ --shell /bin/false --gecos "Kamailio SIP Server" \ - --home /var/run/kamailio kamailio || true + --home /run/kamailio kamailio || true ;; diff --git a/pkg/kamailio/deb/trusty/rules b/pkg/kamailio/deb/trusty/rules index 63df7afd6e2..03dc7b313ea 100755 --- a/pkg/kamailio/deb/trusty/rules +++ b/pkg/kamailio/deb/trusty/rules @@ -165,7 +165,7 @@ install: build # install /etc/default/kamailio file mkdir -p $(CURDIR)/debian/kamailio/etc/default cp -f debian/kamailio.default $(CURDIR)/debian/kamailio/etc/default/kamailio - # delete /var/run/kamailio dir + # delete /run/kamailio dir rm -rf $(CURDIR)/debian/kamailio/usr/local diff --git a/pkg/kamailio/deb/wheezy/kamailio.postinst b/pkg/kamailio/deb/wheezy/kamailio.postinst index 4ee38ecb13c..e2777808b09 100644 --- a/pkg/kamailio/deb/wheezy/kamailio.postinst +++ b/pkg/kamailio/deb/wheezy/kamailio.postinst @@ -6,7 +6,7 @@ case "$1" in configure) adduser --quiet --system --group --disabled-password \ --shell /bin/false --gecos "Kamailio SIP Server" \ - --home /var/run/kamailio kamailio || true + --home /run/kamailio kamailio || true ;; diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules index a6eda06ad67..f6422f44eb3 100755 --- a/pkg/kamailio/deb/wheezy/rules +++ b/pkg/kamailio/deb/wheezy/rules @@ -164,7 +164,7 @@ install: build # install /etc/default/kamailio file mkdir -p $(CURDIR)/debian/kamailio/etc/default cp -f debian/kamailio.default $(CURDIR)/debian/kamailio/etc/default/kamailio - # delete /var/run/kamailio dir + # delete /run/kamailio dir rm -rf $(CURDIR)/debian/kamailio/usr/local diff --git a/pkg/kamailio/deb/xenial/kamailio.postinst b/pkg/kamailio/deb/xenial/kamailio.postinst index 4ee38ecb13c..e2777808b09 100644 --- a/pkg/kamailio/deb/xenial/kamailio.postinst +++ b/pkg/kamailio/deb/xenial/kamailio.postinst @@ -6,7 +6,7 @@ case "$1" in configure) adduser --quiet --system --group --disabled-password \ --shell /bin/false --gecos "Kamailio SIP Server" \ - --home /var/run/kamailio kamailio || true + --home /run/kamailio kamailio || true ;; diff --git a/pkg/kamailio/deb/xenial/rules b/pkg/kamailio/deb/xenial/rules index 6646d27f5f9..ed18676af5c 100755 --- a/pkg/kamailio/deb/xenial/rules +++ b/pkg/kamailio/deb/xenial/rules @@ -165,7 +165,7 @@ install: build # install /etc/default/kamailio file mkdir -p $(CURDIR)/debian/kamailio/etc/default cp -f debian/kamailio.default $(CURDIR)/debian/kamailio/etc/default/kamailio - # delete /var/run/kamailio dir + # delete /run/kamailio dir rm -rf $(CURDIR)/debian/kamailio/usr/local diff --git a/pkg/kamailio/obs/kamailio.init b/pkg/kamailio/obs/kamailio.init index 0d7823637aa..b9802e9241b 100644 --- a/pkg/kamailio/obs/kamailio.init +++ b/pkg/kamailio/obs/kamailio.init @@ -6,7 +6,7 @@ # description: Kamailio (OpenSER) - the Open Source SIP Server # # processname: kamailio -# pidfile: /var/run/kamailio.pid +# pidfile: /run/kamailio.pid # config: /etc/kamailio/kamailio.cfg # ### BEGIN INIT INFO @@ -23,8 +23,8 @@ KAM=/usr/sbin/kamailio KAMCFG=/etc/kamailio/kamailio.cfg PROG=kamailio -HOMEDIR=/var/run/$PROG -PID_FILE=/var/run/$PROG/kamailio.pid +HOMEDIR=/run/$PROG +PID_FILE=/run/$PROG/kamailio.pid LOCK_FILE=/var/lock/subsys/kamailio RETVAL=0 DEFAULTS=/etc/sysconfig/kamailio @@ -102,7 +102,7 @@ if test "$DUMP_CORE" = "yes" ; then echo "$COREDIR/core.%e.sig%s.%p" > /proc/sys/kernel/core_pattern fi -# /var/run can be a tmpfs +# /run can be a tmpfs if [ ! -d $HOMEDIR ]; then mkdir -p $HOMEDIR chown ${USER}:${GROUP} $HOMEDIR diff --git a/pkg/kamailio/obs/kamailio.service b/pkg/kamailio/obs/kamailio.service index c14d6cb2f28..b1305fa37da 100644 --- a/pkg/kamailio/obs/kamailio.service +++ b/pkg/kamailio/obs/kamailio.service @@ -11,7 +11,7 @@ Environment='CFGFILE=/etc/kamailio/kamailio.cfg' Environment='SHM_MEMORY=64' Environment='PKG_MEMORY=4' EnvironmentFile=-/etc/sysconfig/kamailio -ExecStart=/usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY +ExecStart=/usr/sbin/kamailio -DD -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY Restart=on-failure [Install] diff --git a/pkg/kamailio/openbsd/patches/patch-scripts_kamctlrc b/pkg/kamailio/openbsd/patches/patch-scripts_kamctlrc index c61e9c17f3c..43dfb4453d0 100644 --- a/pkg/kamailio/openbsd/patches/patch-scripts_kamctlrc +++ b/pkg/kamailio/openbsd/patches/patch-scripts_kamctlrc @@ -4,8 +4,8 @@ $OpenBSD$ @@ -135,7 +135,7 @@ ## OPENSER START Options - ## PID file path - default is: /var/run/kamailio.pid --# PID_FILE=/var/run/kamailio.pid + ## PID file path - default is: /run/kamailio.pid +-# PID_FILE=/run/kamailio.pid +PID_FILE=/var/kamailio/kamailio.pid ## Extra start options - default is: not set diff --git a/pkg/kamailio/oracle/el6/kamailio.init b/pkg/kamailio/oracle/el6/kamailio.init index 4f8192590d4..e1069cbfedd 100644 --- a/pkg/kamailio/oracle/el6/kamailio.init +++ b/pkg/kamailio/oracle/el6/kamailio.init @@ -6,7 +6,7 @@ # description: Kamailio is a fast SIP Server. # # processname: kamailio -# pidfile: /var/run/kamailio.pid +# pidfile: /run/kamailio.pid # config: /etc/kamailio/kamailio.cfg # Source function library. @@ -15,7 +15,7 @@ KAM=/usr/sbin/kamailio KAMCFG=/etc/kamailio/kamailio.cfg PROG=kamailio -PID_FILE=/var/run/kamailio.pid +PID_FILE=/run/kamailio.pid LOCK_FILE=/var/lock/subsys/kamailio RETVAL=0 DEFAULTS=/etc/default/kamailio diff --git a/pkg/kamailio/oracle/el7/kamailio.service b/pkg/kamailio/oracle/el7/kamailio.service index 8192488b537..030d3740daf 100644 --- a/pkg/kamailio/oracle/el7/kamailio.service +++ b/pkg/kamailio/oracle/el7/kamailio.service @@ -5,8 +5,8 @@ After=syslog.target network-online.target auditd.service [Service] EnvironmentFile=/etc/sysconfig/kamailio -ExecStartPre=/usr/bin/mkdir -m=2770 -p /var/run/kamailio -ExecStartPre=/usr/bin/chown kamailio:kamailio /var/run/kamailio +ExecStartPre=/usr/bin/mkdir -m=2770 -p /run/kamailio +ExecStartPre=/usr/bin/chown kamailio:kamailio /run/kamailio ExecStart=/usr/sbin/kamailio -f $CFG_FILE -P $PID_FILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP $EXTRA_OPTIONS ExecReload=/bin/kill -HUP $MAINPID KillMode=control-group diff --git a/pkg/kamailio/oracle/el7/kamailio.sysconfig b/pkg/kamailio/oracle/el7/kamailio.sysconfig index d451d3486b4..3e696ea06eb 100644 --- a/pkg/kamailio/oracle/el7/kamailio.sysconfig +++ b/pkg/kamailio/oracle/el7/kamailio.sysconfig @@ -31,6 +31,6 @@ DUMP_CORE=no CFG_FILE=/etc/kamailio/kamailio.cfg -PID_FILE=/var/run/kamailio/kamailio.pid +PID_FILE=/run/kamailio/kamailio.pid LOCK_FILE=/var/lock/subsys/kamailio diff --git a/pkg/kamailio/oracle/kamailio.logrotate b/pkg/kamailio/oracle/kamailio.logrotate index cf18c647471..a988ec3ac8b 100644 --- a/pkg/kamailio/oracle/kamailio.logrotate +++ b/pkg/kamailio/oracle/kamailio.logrotate @@ -2,6 +2,6 @@ { sharedscripts postrotate - /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true + /bin/kill -HUP `cat /run/syslogd.pid 2> /dev/null` 2> /dev/null || true endscript } diff --git a/src/Makefile b/src/Makefile index cd772c877b7..2decc4d2cb4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -982,7 +982,7 @@ install_initd_debian install-initd-debian: sed -e "s#DAEMON=/usr/sbin/kamailio#DAEMON=$(bin_prefix)/$(bin_dir)$(NAME)#g" \ -e "s#NAME=kamailio#NAME=$(NAME)#g" \ -e "s#DESC=Kamailio#DESC=$(NAME)#g" \ - -e "s#HOMEDIR=/var/run/kamailio#HOMEDIR=/var/run/$(NAME)#g" \ + -e "s#HOMEDIR=/run/kamailio#HOMEDIR=/run/$(NAME)#g" \ -e "s#DEFAULTS=/etc/default/kamailio#DEFAULTS=/etc/default/$(NAME)#g" \ -e "s#CFGFILE=/etc/kamailio/kamailio.cfg#CFGFILE=$(cfg_prefix)/$(cfg_dir)$(NAME).cfg#g" \ < pkg/kamailio/deb/debian/kamailio.init \ @@ -991,18 +991,18 @@ install_initd_debian install-initd-debian: sed -e "s#RUN_KAMAILIO=no#RUN_KAMAILIO=yes#g" \ < pkg/kamailio/deb/debian/kamailio.default \ > /etc/default/$(NAME) - mkdir -p /var/run/$(NAME) + mkdir -p /run/$(NAME) adduser --quiet --system --group --disabled-password \ --shell /bin/false --gecos "$(NAME)" \ - --home /var/run/$(NAME) $(NAME) - chown $(NAME):$(NAME) /var/run/$(NAME) + --home /run/$(NAME) $(NAME) + chown $(NAME):$(NAME) /run/$(NAME) .PHONY: install_initd_centos install-initd-centos install_initd_centos install-initd-centos: sed -e "s#KAM=/usr/sbin/kamailio#KAM=$(bin_prefix)/$(bin_dir)$(NAME)#g" \ -e "s#PROG=kamailio#PROG=$(NAME)#g" \ -e "s#DEFAULTS=/etc/default/kamailio#DEFAULTS=/etc/default/$(NAME)#g" \ - -e "s#PID_FILE=/var/run/kamailio.pid#PID_FILE=/var/run/$(NAME).pid#g" \ + -e "s#PID_FILE=/run/kamailio.pid#PID_FILE=/run/$(NAME).pid#g" \ -e "s#LOCK_FILE=/var/lock/subsys/kamailio#LOCK_FILE=/var/lock/subsys/$(NAME)#g" \ -e "s#KAMCFG=/etc/kamailio/kamailio.cfg#KAMCFG=$(cfg_prefix)/$(cfg_dir)$(NAME).cfg#g" \ < pkg/kamailio/rpm/kamailio.init \ @@ -1013,17 +1013,17 @@ install_initd_centos install-initd-centos: -e "s#GROUP=kamailio#GROUP=$(NAME)#g" \ < pkg/kamailio/rpm/kamailio.default \ > /etc/default/$(NAME) - mkdir -p /var/run/$(NAME) + mkdir -p /run/$(NAME) /usr/sbin/groupadd -r $(NAME) /usr/sbin/useradd -r -g $(NAME) -s /bin/false -c "Kamailio Daemon" \ - -d /var/run/$(NAME) $(NAME) - chown $(NAME):$(NAME) /var/run/$(NAME) + -d /run/$(NAME) $(NAME) + chown $(NAME):$(NAME) /run/$(NAME) .PHONY: install_systemd_debian install-systemd-debian install_systemd_debian install-systemd-debian: sed -e "s#ExecStart=/usr/sbin/kamailio#ExecStart=$(bin_prefix)/$(bin_dir)$(NAME)#g" \ -e "s#Description=Kamailio#Description=$(NAME)#g" \ - -e "s#/var/run/kamailio/kamailio.pid#/var/run/$(NAME)/$(NAME).pid#g" \ + -e "s#/run/kamailio/kamailio.pid#/run/$(NAME)/$(NAME).pid#g" \ -e "s#EnvironmentFile=-/etc/default/kamailio#EnvironmentFile=-/etc/default/$(NAME)#g" \ -e "s#CFGFILE=/etc/kamailio/kamailio.cfg#CFGFILE=$(cfg_prefix)/$(cfg_dir)$(NAME).cfg#g" \ < ../pkg/kamailio/deb/debian/kamailio.service \ @@ -1031,11 +1031,11 @@ install_systemd_debian install-systemd-debian: sed -e "s#RUN_KAMAILIO=no#RUN_KAMAILIO=yes#g" \ < ../pkg/kamailio/deb/debian/kamailio.default \ > /etc/default/$(NAME) - mkdir -p /var/run/$(NAME) + mkdir -p /run/$(NAME) adduser --quiet --system --group --disabled-password \ --shell /bin/false --gecos "$(NAME)" \ - --home /var/run/$(NAME) $(NAME) - chown $(NAME):$(NAME) /var/run/$(NAME) + --home /run/$(NAME) $(NAME) + chown $(NAME):$(NAME) /run/$(NAME) echo "D /run/$(NAME) 0700 $(NAME) $(NAME) -" > /etc/tmpfiles.d/$(NAME).conf @echo @echo "* to enable kamailio service run:" @@ -1045,18 +1045,18 @@ install_systemd_debian install-systemd-debian: install_systemd_centos install-systemd-centos: sed -e "s#ExecStart=/usr/sbin/kamailio#ExecStart=$(bin_prefix)/$(bin_dir)$(NAME)#g" \ -e "s#Description=Kamailio#Description=$(NAME)#g" \ - -e "s#/var/run/kamailio/kamailio.pid#/var/run/$(NAME)/$(NAME).pid#g" \ + -e "s#/run/kamailio/kamailio.pid#/run/$(NAME)/$(NAME).pid#g" \ -e "s#EnvironmentFile=-/etc/sysconfig/kamailio#EnvironmentFile=-/etc/sysconfig/$(NAME)#g" \ -e "s#CFGFILE=/etc/kamailio/kamailio.cfg#CFGFILE=$(cfg_prefix)/$(cfg_dir)$(NAME).cfg#g" \ < ../pkg/kamailio/obs/kamailio.service \ > /etc/systemd/system/$(NAME).service cp ../pkg/kamailio/obs/kamailio.sysconfig \ /etc/sysconfig/$(NAME) - mkdir -p /var/run/$(NAME) - chmod 0700 /var/run/$(NAME) + mkdir -p /run/$(NAME) + chmod 0700 /run/$(NAME) groupadd --system $(NAME) - useradd $(NAME) --system --shell /sbin/nologin -g $(NAME) --home /var/run/$(NAME) - chown $(NAME):$(NAME) /var/run/$(NAME) + useradd $(NAME) --system --shell /sbin/nologin -g $(NAME) --home /run/$(NAME) + chown $(NAME):$(NAME) /run/$(NAME) echo "D /run/$(NAME) 0700 $(NAME) $(NAME) -" > /etc/tmpfiles.d/$(NAME).conf @echo @echo "* to enable kamailio service run:" diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index bcd8eae513a..75179c73dc8 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -121,7 +121,7 @@ int parse_param_stop(unsigned int type, void *val); /* Local global variables */ static CallControlSocket callcontrol_socket = { - "/var/run/callcontrol/socket", // name + "/run/callcontrol/socket", // name -1, // sock 500, // timeout in 500 miliseconds if there is no answer 0, // time of the last failure diff --git a/src/modules/call_control/doc/call_control.8 b/src/modules/call_control/doc/call_control.8 index a59b672e5fb..ea3d50d25b4 100644 --- a/src/modules/call_control/doc/call_control.8 +++ b/src/modules/call_control/doc/call_control.8 @@ -38,11 +38,11 @@ Default value is 0. .TP It is the path to the filesystem socket where the callcontrol application listens for commands from the module. .TP -Default value is /var/run/callcontrol/socket. +Default value is /run/callcontrol/socket. .TP .B Setting the socket_name parameter .TP - modparam("call_control", "socket_name", "/var/run/callcontrol/socket") ... + modparam("call_control", "socket_name", "/run/callcontrol/socket") ... .TP 16 .I socket_timeout (int) .TP diff --git a/src/modules/call_control/doc/call_control_admin.xml b/src/modules/call_control/doc/call_control_admin.xml index 81a49d98513..a7a57a8d735 100644 --- a/src/modules/call_control/doc/call_control_admin.xml +++ b/src/modules/call_control/doc/call_control_admin.xml @@ -218,7 +218,7 @@ modparam("call_control", "disable", 1) Default value is - /var/run/callcontrol/socket. + /run/callcontrol/socket. @@ -226,7 +226,7 @@ modparam("call_control", "disable", 1) Setting the <varname>socket_name</varname> parameter ... -modparam("call_control", "socket_name", "/var/run/callcontrol/socket") +modparam("call_control", "socket_name", "/run/callcontrol/socket") ... diff --git a/src/modules/cfgt/doc/cfgt_admin.xml b/src/modules/cfgt/doc/cfgt_admin.xml index c85cae43355..76fb767502c 100644 --- a/src/modules/cfgt/doc/cfgt_admin.xml +++ b/src/modules/cfgt/doc/cfgt_admin.xml @@ -73,7 +73,7 @@ Set <varname>cfgtrace</varname> parameter ... -modparam("cfgt", "basedir", "/var/run/kamailio/cfgtest") +modparam("cfgt", "basedir", "/run/kamailio/cfgtest") ... diff --git a/src/modules/ctl/ctl.cfg b/src/modules/ctl/ctl.cfg index 5d9bde4e64e..4966e7c4db2 100644 --- a/src/modules/ctl/ctl.cfg +++ b/src/modules/ctl/ctl.cfg @@ -31,7 +31,7 @@ alias="foo.bar" loadmodule "modules/ctl/ctl.so" # optional listen addresses, if no one is specified, -# ctl will by default listen on unixs:/var/run/kamailio/kamailio_ctl. +# ctl will by default listen on unixs:/run/kamailio/kamailio_ctl. modparam("ctl", "binrpc", "unix:/tmp/kamailio_ctl") # modparam("ctl", "binrpc", "udp:localhost:2046") modparam("ctl", "binrpc", "tcp:localhost:2046") diff --git a/src/modules/ctl/doc/ctl.xml b/src/modules/ctl/doc/ctl.xml index 987ccb940af..0f79d35b5ae 100644 --- a/src/modules/ctl/doc/ctl.xml +++ b/src/modules/ctl/doc/ctl.xml @@ -40,8 +40,8 @@ By default (if no parameters are changed in the config file) it uses - a Unix stream socket under /var/run/&kamailiobinary;: - /var/run/&kamailiobinary;/&ctlsocket;. This socket is also the + a Unix stream socket under /run/&kamailiobinary;: + /run/&kamailiobinary;/&ctlsocket;. This socket is also the default for &sercmd;. diff --git a/src/modules/ctl/doc/ctl_params.xml b/src/modules/ctl/doc/ctl_params.xml index d94efdd6cac..23541827678 100644 --- a/src/modules/ctl/doc/ctl_params.xml +++ b/src/modules/ctl/doc/ctl_params.xml @@ -64,7 +64,7 @@ Default: - "unix:/var/run/&kamailiobinary;/&kamailiobinary;_ctl" (Unix stream socket). + "unix:/run/&kamailiobinary;/&kamailiobinary;_ctl" (Unix stream socket). The default value is used only if no binrpc parameter is found in the config file. @@ -75,7 +75,7 @@ loadmodule "ctl" # optional listen addresses, if no one is specified, # ctl will listen on unixs:/tmp/ser_ctl -modparam("ctl", "binrpc", "unix:/var/run/&kamailiobinary;/&kamailiobinary;_ctl") # default +modparam("ctl", "binrpc", "unix:/run/&kamailiobinary;/&kamailiobinary;_ctl") # default modparam("ctl", "binrpc", "udp:localhost:2046") modparam("ctl", "binrpc", "tcp:localhost:2046") modparam("ctl", "binrpc", "unixd:/tmp/unix_dgram") # unix datagram diff --git a/src/modules/ctl/doc/ctl_rpc.xml b/src/modules/ctl/doc/ctl_rpc.xml index 318f98e13e8..1f8461fd8c3 100644 --- a/src/modules/ctl/doc/ctl_rpc.xml +++ b/src/modules/ctl/doc/ctl_rpc.xml @@ -23,7 +23,7 @@ <function>print</function> usage $ &sercmd; -f"[%v] %v:%v %v\n" ctl.listen -[binrpc] unix_stream:/var/run/&kamailiobinary;/&kamailiobinary;_ctl +[binrpc] unix_stream:/run/&kamailiobinary;/&kamailiobinary;_ctl # note: the above command is equivalent with &sercmd; listen @@ -53,7 +53,7 @@ <function>ctl.who</function> usage $ &sercmd; -f"[%v] %v: %v %v -> %v %v\n" ctl.who -[binrpc] unix_stream: <anonymous unix socket> -> /var/run/&kamailiobinary;/&kamailiobinary;_ctl +[binrpc] unix_stream: <anonymous unix socket> -> /run/&kamailiobinary;/&kamailiobinary;_ctl # note the above command is equivalent to &sercmd; who diff --git a/src/modules/db_mysql/doc/db_mysql_admin.xml b/src/modules/db_mysql/doc/db_mysql_admin.xml index 69b81d33d72..26e32d8d363 100644 --- a/src/modules/db_mysql/doc/db_mysql_admin.xml +++ b/src/modules/db_mysql/doc/db_mysql_admin.xml @@ -250,7 +250,7 @@ default-character-set = utf8 ... [client] -socket = /var/run/mysql/mysqld.sock +socket = /run/mysql/mysqld.sock [kamailio] socket = /path/to/mysqld.sock diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 75d26de330f..11881bbed58 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -89,7 +89,7 @@ Set the <quote>list_file</quote> parameter ... -modparam("dispatcher", "list_file", "/var/run/kamailio/dispatcher.list") +modparam("dispatcher", "list_file", "/run/kamailio/dispatcher.list") ... diff --git a/src/modules/ims_diameter_server/examples/kamailio.cfg b/src/modules/ims_diameter_server/examples/kamailio.cfg index 97dbac0291d..e7ac323b341 100644 --- a/src/modules/ims_diameter_server/examples/kamailio.cfg +++ b/src/modules/ims_diameter_server/examples/kamailio.cfg @@ -78,7 +78,7 @@ loadmodule "statistics" modparam("cdp","config_file","/etc/kamailio_hss/hss.xml") # ----- ctl params ----- -modparam("ctl", "binrpc", "unix:/var/run/kamailio_hss/kamailio_ctl") +modparam("ctl", "binrpc", "unix:/run/kamailio_hss/kamailio_ctl") # ----- http_client params ----- modparam("http_client", "httpcon", "hss=>https://hss:password@rest.ng-voice.com/hss") diff --git a/src/modules/ims_ocs/examples/full/kamailio.cfg b/src/modules/ims_ocs/examples/full/kamailio.cfg index d29480a15e5..9d053eddbb3 100644 --- a/src/modules/ims_ocs/examples/full/kamailio.cfg +++ b/src/modules/ims_ocs/examples/full/kamailio.cfg @@ -53,7 +53,7 @@ memlog=5 log_stderror=no sip_warning=no -rundir="/var/run/kamailio_ocs" +rundir="/run/kamailio_ocs" user_agent_header="User-Agent: TelcoSuite OCS" server_header="Server: TelcoSuite OCS" @@ -115,7 +115,7 @@ loadmodule "mi_rpc" # ----- db_cluster params ----- # ----- ctl params ----- -modparam("ctl", "binrpc", "unix:/var/run/kamailio_ocs/kamailio_ctl") +modparam("ctl", "binrpc", "unix:/run/kamailio_ocs/kamailio_ctl") #!ifdef DB_URL2 loadmodule "db_cluster" diff --git a/src/modules/ims_ocs/examples/simple/kamailio.cfg b/src/modules/ims_ocs/examples/simple/kamailio.cfg index 0f02abc43b8..9453539ded1 100644 --- a/src/modules/ims_ocs/examples/simple/kamailio.cfg +++ b/src/modules/ims_ocs/examples/simple/kamailio.cfg @@ -39,7 +39,7 @@ memlog=5 log_stderror=no sip_warning=no -rundir="/var/run/kamailio_ocs" +rundir="/run/kamailio_ocs" user_agent_header="User-Agent: TelcoSuite OCS" server_header="Server: TelcoSuite OCS" @@ -87,7 +87,7 @@ loadmodule "kex" loadmodule "corex" # ----- ctl params ----- -modparam("ctl", "binrpc", "unix:/var/run/kamailio_ocs/kamailio_ctl") +modparam("ctl", "binrpc", "unix:/run/kamailio_ocs/kamailio_ctl") # ----- cdp params ----- modparam("cdp","config_file","/etc/kamailio_ocs/ocs.xml") diff --git a/src/modules/mediaproxy/doc/mediaproxy_admin.xml b/src/modules/mediaproxy/doc/mediaproxy_admin.xml index d0ef53cdf69..8eac1e90e88 100644 --- a/src/modules/mediaproxy/doc/mediaproxy_admin.xml +++ b/src/modules/mediaproxy/doc/mediaproxy_admin.xml @@ -184,7 +184,7 @@ modparam("mediaproxy", "disable", 1) Default value is - /var/run/mediaproxy/dispatcher.sock. + /run/mediaproxy/dispatcher.sock. @@ -192,7 +192,7 @@ modparam("mediaproxy", "disable", 1) Setting the <varname>mediaproxy_socket</varname> parameter ... -modparam("mediaproxy", "mediaproxy_socket", "/var/run/mediaproxy/dispatcher.sock") +modparam("mediaproxy", "mediaproxy_socket", "/run/mediaproxy/dispatcher.sock") ... diff --git a/src/modules/mediaproxy/mediaproxy.c b/src/modules/mediaproxy/mediaproxy.c index e3b532786f9..29ceca4d3f7 100644 --- a/src/modules/mediaproxy/mediaproxy.c +++ b/src/modules/mediaproxy/mediaproxy.c @@ -191,7 +191,7 @@ static int mediaproxy_disabled = False; static str ice_candidate = str_init("none"); static MediaproxySocket mediaproxy_socket = { - "/var/run/mediaproxy/dispatcher.sock", // name + "/run/mediaproxy/dispatcher.sock", // name -1, // sock 500, // timeout in 500 miliseconds if there is no answer 0, // time of the last failure diff --git a/src/modules/nat_traversal/doc/nat_traversal_admin.xml b/src/modules/nat_traversal/doc/nat_traversal_admin.xml index 6bef7e80a32..f5e8ef00f5a 100644 --- a/src/modules/nat_traversal/doc/nat_traversal_admin.xml +++ b/src/modules/nat_traversal/doc/nat_traversal_admin.xml @@ -492,7 +492,7 @@ modparam("nat_traversal", "keepalive_extra_headers", "User-Agent: &kamailio;\r\n Setting the <varname>keepalive_state_file</varname> parameter ... -modparam("nat_traversal", "keepalive_state_file", "/var/run/kamailio/keepalive_state") +modparam("nat_traversal", "keepalive_state_file", "/run/kamailio/keepalive_state") ... diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 582e6fd2974..6581238de10 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -144,7 +144,7 @@ modparam("sipdump", "rotate", 3600) Set <varname>folder</varname> parameter ... -modparam("sipdump", "folder", "/var/run/kamailio") +modparam("sipdump", "folder", "/run/kamailio") ... diff --git a/test/unit/7.cfg b/test/unit/7.cfg index 12aee0ce497..28f74239881 100644 --- a/test/unit/7.cfg +++ b/test/unit/7.cfg @@ -181,7 +181,7 @@ modparam("nathelper", "sipping_method", "OPTIONS") modparam("nathelper", "received_avp", "$avp(i:801)") loadmodule "rtpproxy/rtpproxy.so" -modparam("rtpproxy", "rtpproxy_sock", "unix:/var/run/rtpproxy.sock") +modparam("rtpproxy", "rtpproxy_sock", "unix:/run/rtpproxy.sock") modparam("rtpproxy", "rtpproxy_disable_tout", 60) modparam("rtpproxy", "rtpproxy_tout", 1) modparam("rtpproxy", "rtpproxy_retr", 5) diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 01518faae0f..6dd3686b39e 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -101,7 +101,7 @@ fi ##### ------------------------------------------------ ##### ### configuration for starting/stopping kamailio if [ -z "$PID_FILE" ] ; then - PID_FILE=/var/run/kamailio/kamailio.pid + PID_FILE=/run/kamailio/kamailio.pid fi if [ -z "$SYSLOG" ] ; then SYSLOG=1 # 0=output to console, 1=output to syslog diff --git a/utils/kamctl/kamctl.rpcfifo b/utils/kamctl/kamctl.rpcfifo index ecf381fa41c..e8fe93f99d6 100644 --- a/utils/kamctl/kamctl.rpcfifo +++ b/utils/kamctl/kamctl.rpcfifo @@ -23,7 +23,7 @@ fi ### parameters # if [ -z "$RPCFIFOPATH" ]; then - RPCFIFOPATH=/var/run/kamailio/kamailio_rpc.fifo + RPCFIFOPATH=/run/kamailio/kamailio_rpc.fifo fi # diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index a49c79f2ece..abe4afffbc7 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -136,7 +136,7 @@ # CTLENGINE="RPCFIFO" ## path to FIFO file for engine RPCFIFO -# RPCFIFOPATH="/var/run/kamailio/kamailio_rpc_fifo" +# RPCFIFOPATH="/run/kamailio/kamailio_rpc_fifo" ## check ACL names; default on (1); off (0) # VERIFY_ACL=1 @@ -157,8 +157,8 @@ # STORE_PLAINTEXT_PW=0 ## Kamailio START Options -## PID file path - default is: /var/run/kamailio/kamailio.pid -# PID_FILE=/var/run/kamailio/kamailio.pid +## PID file path - default is: /run/kamailio/kamailio.pid +# PID_FILE=/run/kamailio/kamailio.pid ## Extra start options - default is: not set # example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64" diff --git a/utils/pdbt/debian/pdb-server.init.d b/utils/pdbt/debian/pdb-server.init.d index 49a9b31fd21..8056a449918 100644 --- a/utils/pdbt/debian/pdb-server.init.d +++ b/utils/pdbt/debian/pdb-server.init.d @@ -4,7 +4,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/bin/pdb_server NAME=pdb_server DESC=pdb_server -PIDFILE=/var/run/pdb_server.pid +PIDFILE=/run/pdb_server.pid test -x $DAEMON || exit 0