diff --git a/files/autopause/autopause-fcns.sh b/files/autopause/autopause-fcns.sh index 69eb9d08..bf6cc7c4 100644 --- a/files/autopause/autopause-fcns.sh +++ b/files/autopause/autopause-fcns.sh @@ -5,15 +5,15 @@ current_uptime() { } java_running() { - [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] + [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] } java_process_exists() { - [[ -n "$(ps -ax -o comm | grep 'java')" ]] + [[ -n "$(ps -a -o comm | grep 'java')" ]] } rcon_client_exists() { - [[ -n "$(ps -ax -o comm | grep 'rcon-cli')" ]] + [[ -n "$(ps -a -o comm | grep 'rcon-cli')" ]] } mc_server_listening() { diff --git a/files/autopause/knockd-config.cfg b/files/autopause/knockd-config.cfg index 68ab28de..86c98d02 100644 --- a/files/autopause/knockd-config.cfg +++ b/files/autopause/knockd-config.cfg @@ -3,10 +3,10 @@ [unpauseMCServer-server] sequence = 25565 seq_timeout = 1 - command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh + command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh tcpflags = syn [unpauseMCServer-rcon] sequence = 25575 seq_timeout = 1 - command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh + command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh tcpflags = syn diff --git a/files/autopause/pause.sh b/files/autopause/pause.sh index bcd1a06c..9bcb4a06 100755 --- a/files/autopause/pause.sh +++ b/files/autopause/pause.sh @@ -2,7 +2,7 @@ . /start-utils -if [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; then +if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; then # save world rcon-cli save-all >/dev/null diff --git a/files/autopause/resume.sh b/files/autopause/resume.sh index 6ae5a8cf..5d1686f0 100755 --- a/files/autopause/resume.sh +++ b/files/autopause/resume.sh @@ -2,7 +2,7 @@ . /start-utils -if [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^T.*$ ]] ; then +if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^T.*$ ]] ; then logAutopauseAction "Knocked, resuming Java process" pkill -CONT java fi