From 739da185fd61b318976961c519169d33bf9bf46a Mon Sep 17 00:00:00 2001 From: Sean Wysor Date: Thu, 3 Nov 2016 11:23:55 -0700 Subject: [PATCH] Fixed pidfile location (#113) --- system/sbin/kazoo-freeswitch | 4 ++-- system/systemd/kazoo-freeswitch.service | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/system/sbin/kazoo-freeswitch b/system/sbin/kazoo-freeswitch index c455f51..6294047 100755 --- a/system/sbin/kazoo-freeswitch +++ b/system/sbin/kazoo-freeswitch @@ -11,12 +11,12 @@ fi RETVAL=1 USER=${FS_USER:-freeswitch} BIN_FILE=${FS_BIN:-/usr/bin/freeswitch} -PID_FILE=${FS_PID:-/var/run/freeswitch/kazoo-freeswitch.pid} +PID_FILE=${FS_PID:-/var/run/freeswitch/freeswitch.pid} CFG_FILE=${FS_CONFIG:-/etc/kazoo/freeswitch} export HOME=${FS_HOME:-/var/lib/kazoo-freeswitch} if [ -z "${FREESWITCH_ARGS}" ]; then - FREESWITCH_ARGS="-nonat -conf ${CFG_FILE} -db /var/lib/kazoo-freeswitch/db -log /var/log/freeswitch -cache /var/lib/kazoo-freeswitch/cache -sounds /usr/share/kazoo-freeswitch/sounds -storage /var/lib/kazoo-freeswitch/storage" + FREESWITCH_ARGS="-nonat -conf ${CFG_FILE} -run /var/run/freeswitch -db /var/lib/kazoo-freeswitch/db -log /var/log/freeswitch -cache /var/lib/kazoo-freeswitch/cache -sounds /usr/share/kazoo-freeswitch/sounds -storage /var/lib/kazoo-freeswitch/storage" fi prepare() { diff --git a/system/systemd/kazoo-freeswitch.service b/system/systemd/kazoo-freeswitch.service index c16a747..294a619 100644 --- a/system/systemd/kazoo-freeswitch.service +++ b/system/systemd/kazoo-freeswitch.service @@ -16,6 +16,7 @@ ExecStartPre=/usr/sbin/kazoo-freeswitch prepare ExecStart=/usr/sbin/kazoo-freeswitch start -nc -nf ExecReload=/usr/bin/kill -HUP $MAINPID Restart=on-abort +PIDFile=/var/run/freeswitch/freeswitch.pid [Install] WantedBy=multi-user.target