ruhnet
/
kazoo-configs-kamailio
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 183 Wiki Activity
Browse Source

keep the env during sudo and formatting tweaks

4.0
bitbashing 10 years ago
parent
08d9a7dd65
commit
1b8129da37
2 changed files with 32 additions and 32 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +12
    -12
      system/sbin/kazoo-applications
  2. +20
    -20
      system/sbin/kazoo-ecallmgr

+ 12
- 12
system/sbin/kazoo-applications View File

@ -34,7 +34,7 @@ prepare() {
start() { start() {
cd ${HOME} cd ${HOME}
if sudo -u ${USER} ${BIN_FILE} pid > /dev/null 2>&1; then
if sudo -E -u ${USER} ${BIN_FILE} pid > /dev/null 2>&1; then
echo "Kazoo ${NAME} is already running!" echo "Kazoo ${NAME} is already running!"
RETVAL=1 RETVAL=1
return return
@ -45,7 +45,7 @@ start() {
if [ "$(whoami)" == "${USER}" ]; then if [ "$(whoami)" == "${USER}" ]; then
exec "$@" exec "$@"
else else
exec sudo -u ${USER} "$@"
exec sudo -E -u ${USER} "$@"
fi fi
RETVAL=$? RETVAL=$?
@ -58,9 +58,9 @@ start() {
stop() { stop() {
cd ${HOME} cd ${HOME}
sudo -u ${USER} ${BIN_FILE} stop
sudo -E -u ${USER} ${BIN_FILE} stop
if sudo -u ${USER} ${BIN_FILE} pid > /dev/null 2>&1; then
if sudo -E -u ${USER} ${BIN_FILE} pid > /dev/null 2>&1; then
echo "Failed to stop Kazoo ${NAME}!" echo "Failed to stop Kazoo ${NAME}!"
RETVAL=1 RETVAL=1
fi fi
@ -74,17 +74,17 @@ restart() {
status() { status() {
cd ${HOME} cd ${HOME}
sudo -u ${USER} ${BIN_FILE} eval 'kz_nodes:status().' | sed \$d
sudo -E -u ${USER} ${BIN_FILE} eval 'kz_nodes:status().' | sed \$d
RETVAL=$? RETVAL=$?
} }
connect() { connect() {
cd ${HOME} cd ${HOME}
COOKIE=`sudo -u ${USER} ${BIN_FILE} eval 'erlang:get_cookie()'`
COOKIE=`sudo -E -u ${USER} ${BIN_FILE} eval 'erlang:get_cookie()'`
export COOKIE_ARG="-setcookie ${COOKIE}" export COOKIE_ARG="-setcookie ${COOKIE}"
sudo -u ${USER} ${BIN_FILE} remote_console
sudo -E -u ${USER} ${BIN_FILE} remote_console
RETVAL=$? RETVAL=$?
} }
@ -93,27 +93,27 @@ attach() {
echo "WARNING: You are now directly attached to the running ${NAME} Erlang node." echo "WARNING: You are now directly attached to the running ${NAME} Erlang node."
echo " It is safer to use: $0 connect" echo " It is safer to use: $0 connect"
sudo -u ${USER} ${BIN_FILE} attach
sudo -E -u ${USER} ${BIN_FILE} attach
RETVAL=$? RETVAL=$?
} }
ping() { ping() {
cd ${HOME} cd ${HOME}
COOKIE=`sudo -u ${USER} ${BIN_FILE} eval 'erlang:get_cookie()'`
COOKIE=`sudo -E -u ${USER} ${BIN_FILE} eval 'erlang:get_cookie()'`
export COOKIE_ARG="-setcookie ${COOKIE}" export COOKIE_ARG="-setcookie ${COOKIE}"
sudo -u ${USER} ${BIN_FILE} ping
sudo -E -u ${USER} ${BIN_FILE} ping
RETVAL=$? RETVAL=$?
} }
pid() { pid() {
cd ${HOME} cd ${HOME}
COOKIE=`sudo -u ${USER} ${BIN_FILE} eval 'erlang:get_cookie()'`
COOKIE=`sudo -E -u ${USER} ${BIN_FILE} eval 'erlang:get_cookie()'`
export COOKIE_ARG="-setcookie ${COOKIE}" export COOKIE_ARG="-setcookie ${COOKIE}"
sudo -u ${USER} ${BIN_FILE} pid
sudo -E -u ${USER} ${BIN_FILE} pid
RETVAL=$? RETVAL=$?
} }


+ 20
- 20
system/sbin/kazoo-ecallmgr View File

@ -34,7 +34,7 @@ prepare() {
start() { start() {
cd ${HOME} cd ${HOME}
if sudo -u ${USER} ${BIN_FILE} pid > /dev/null 2>&1; then
if sudo -E -u ${USER} ${BIN_FILE} pid > /dev/null 2>&1; then
echo "Kazoo ${NAME} is already running!" echo "Kazoo ${NAME} is already running!"
RETVAL=1 RETVAL=1
return return
@ -45,7 +45,7 @@ start() {
if [ "$(whoami)" == "${USER}" ]; then if [ "$(whoami)" == "${USER}" ]; then
exec "$@" exec "$@"
else else
exec sudo -u ${USER} "$@"
exec sudo -E -u ${USER} "$@"
fi fi
RETVAL=$? RETVAL=$?
@ -58,9 +58,9 @@ start() {
stop() { stop() {
cd ${HOME} cd ${HOME}
sudo -u ${USER} ${BIN_FILE} stop
sudo -E -u ${USER} ${BIN_FILE} stop
if sudo -u ${USER} ${BIN_FILE} pid > /dev/null 2>&1; then
if sudo -E -u ${USER} ${BIN_FILE} pid > /dev/null 2>&1; then
echo "Failed to stop Kazoo ${NAME}!" echo "Failed to stop Kazoo ${NAME}!"
RETVAL=1 RETVAL=1
fi fi
@ -74,17 +74,17 @@ restart() {
status() { status() {
cd ${HOME} cd ${HOME}
sudo -u ${USER} ${BIN_FILE} eval 'kz_nodes:status().' | sed \$d
sudo -E -u ${USER} ${BIN_FILE} eval 'kz_nodes:status().' | sed \$d
RETVAL=$? RETVAL=$?
} }
connect() { connect() {
cd ${HOME} cd ${HOME}
COOKIE=`sudo -u ${USER} ${BIN_FILE} eval 'erlang:get_cookie()'`
COOKIE=`sudo -E -u ${USER} ${BIN_FILE} eval 'erlang:get_cookie()'`
export COOKIE_ARG="-setcookie ${COOKIE}" export COOKIE_ARG="-setcookie ${COOKIE}"
sudo -u ${USER} ${BIN_FILE} remote_console
sudo -E -u ${USER} ${BIN_FILE} remote_console
RETVAL=$? RETVAL=$?
} }
@ -93,27 +93,27 @@ attach() {
echo "WARNING: You are now directly attached to the running ${NAME} Erlang node." echo "WARNING: You are now directly attached to the running ${NAME} Erlang node."
echo " It is safer to use: $0 connect" echo " It is safer to use: $0 connect"
sudo -u ${USER} ${BIN_FILE} attach
sudo -E -u ${USER} ${BIN_FILE} attach
RETVAL=$? RETVAL=$?
} }
ping() { ping() {
cd ${HOME} cd ${HOME}
COOKIE=`sudo -u ${USER} ${BIN_FILE} eval 'erlang:get_cookie()'`
COOKIE=`sudo -E -u ${USER} ${BIN_FILE} eval 'erlang:get_cookie()'`
export COOKIE_ARG="-setcookie ${COOKIE}" export COOKIE_ARG="-setcookie ${COOKIE}"
sudo -u ${USER} ${BIN_FILE} ping
sudo -E -u ${USER} ${BIN_FILE} ping
RETVAL=$? RETVAL=$?
} }
pid() { pid() {
cd ${HOME} cd ${HOME}
COOKIE=`sudo -u ${USER} ${BIN_FILE} eval 'erlang:get_cookie()'`
COOKIE=`sudo -E -u ${USER} ${BIN_FILE} eval 'erlang:get_cookie()'`
export COOKIE_ARG="-setcookie ${COOKIE}" export COOKIE_ARG="-setcookie ${COOKIE}"
sudo -u ${USER} ${BIN_FILE} pid
sudo -E -u ${USER} ${BIN_FILE} pid
RETVAL=$? RETVAL=$?
} }
@ -125,8 +125,8 @@ case "$1" in
start "start" start "start"
;; ;;
foreground) foreground)
start "foreground"
;;
start "foreground"
;;
stop) stop)
stop stop
;; ;;
@ -140,14 +140,14 @@ case "$1" in
connect connect
;; ;;
attach) attach)
attach
;;
attach
;;
ping) ping)
ping
;;
ping
;;
pid) pid)
pid
;;
pid
;;
*) *)
echo "Usage: $0 (prpeare|start|foreground|stop|restart|status|connect|attach|ping|pid)" echo "Usage: $0 (prpeare|start|foreground|stop|restart|status|connect|attach|ping|pid)"
RETVAL=1 RETVAL=1


Write Preview
Loading…
Cancel
Save