Show IP address that caused auto-pause to resume (#1709)

Also
* Refactored auto files, server.properties, and rcon-cmds

files/auto/autopause-daemon.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /autopause/autopause-fcns.sh
+. /auto/autopause-fcns.sh
 
 # shellcheck source=../../scripts/start-utils
 . "${SCRIPTS:-/}start-utils"
@@ -76,7 +76,7 @@ do
     else
       if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
         logAutopause "No client connected since startup / knocked - pausing"
-        /autopause/pause.sh
+        /auto/pause.sh
         STATE=S
       fi
     fi
@@ -97,7 +97,7 @@ do
     else
       if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
         logAutopause "No client reconnected - pausing"
-        /autopause/pause.sh
+        /auto/pause.sh
         STATE=S
       fi
     fi
@@ -105,7 +105,7 @@ do
   XS)
     # Stopped
     if rcon_client_exists ; then
-      /autopause/resume.sh
+      /auto/resume.sh
     fi
     if java_running ; then
       if java_clients_connected ; then
@@ -113,7 +113,11 @@ do
         STATE=E
       else
         TIME_THRESH=$(($(current_uptime)+$AUTOPAUSE_TIMEOUT_KN))
-        logAutopause "Server was knocked - waiting for clients or timeout"
+        from=unknown
+        if [ -e /var/log/knocked-source ]; then
+          from=$(cat /var/log/knocked-source)
+        fi
+        logAutopause "Server was knocked from $from - waiting for clients or timeout"
         STATE=K
       fi
     fi

files/auto/autostop-daemon.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # needed for the clients connected function residing in autopause
-. /autopause/autopause-fcns.sh
+. /auto/autopause-fcns.sh
 
 # shellcheck source=../../scripts/start-utils
 . "${SCRIPTS:-/}start-utils"
@@ -40,7 +40,7 @@ do
     else
       if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
         logAutostop "No client connected since startup - stopping server"
-        /autostop/stop.sh
+        /auto/stop.sh
         exit 0
       fi
     fi
@@ -61,7 +61,7 @@ do
     else
       if [[ $(current_uptime) -ge $TIME_THRESH ]] ; then
         logAutostop "No client reconnected - stopping"
-        /autostop/stop.sh
+        /auto/stop.sh
         exit 0
       fi
     fi

files/auto/knockd-config.cfg

@@ -3,13 +3,13 @@
 [unpauseMCServer-server]
  sequence = 25565
  seq_timeout = 1
- command = /autopause/resume.sh
+ command = /auto/resume.sh %IP%
  tcpflags = syn
 [unpauseMCServer-rcon]
  sequence = 25575
  seq_timeout = 1
- command = /autopause/resume.sh
+ command = /auto/resume.sh %IP%
  tcpflags = syn
 [unpauseMCServer-bedrock]
  sequence = 19132:udp
- command = /autopause/resume.sh
+ command = /auto/resume.sh %IP%

files/auto/resume.sh

@@ -6,6 +6,7 @@ if isTrue "${DEBUG_AUTOPAUSE}"; then
 fi
 
 if [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^T.*$ ]] ; then
-  logAutopauseAction "Knocked, resuming Java process"
+  logAutopauseAction "Knocked from $1, resuming Java process"
+  echo "$1" > /var/log/knocked-source
   pkill -CONT java
 fi

files/rconcmds/rcon-cmds-daemon.sh

@@ -1,101 +0,0 @@
-#!/bin/bash
-
-: "${RCON_CMDS_STARTUP:=}"
-: "${RCON_CMDS_ON_CONNECT:=}"
-: "${RCON_CMDS_ON_DISCONNECT:=}"
-: "${RCON_CMDS_FIRST_CONNECT:=}"
-: "${RCON_CMDS_LAST_DISCONNECT:=}"
-: "${RCON_CMDS_PERIOD:=10}"
-
-# needed for the clients connected function residing in autopause
-# shellcheck source=/autopause/autopause-fcns.sh
-. /autopause/autopause-fcns.sh
-
-# shellcheck source=start-utils
-. ${SCRIPTS:-/}start-utils
-
-run_command(){
-  rcon_cmd="$1"
-  logRcon "running - $rcon_cmd"
-  output=$(rcon-cli "$rcon_cmd")
-  logRcon "$output"
-}
-
-
-# wait for java process to be started
-while :
-do
-  if java_process_exists ; then
-    break
-  fi
-  sleep 0.1
-done
-
-CLIENTCONNECTIONS=0
-STATE=INIT
-
-while :
-do
-  case X$STATE in
-  XINIT)
-    # Server startup
-    if mc_server_listening ; then
-      logRcon "MCServer is listening, running startup"
-      if [[ "$RCON_CMDS_STARTUP" ]]; then
-        while read -r cmd; do
-          run_command "$cmd"
-        done <<< "$RCON_CMDS_STARTUP"
-      fi
-      if 
-        [[ -z "$RCON_CMDS_ON_CONNECT" ]] && 
-        [[ -z "$RCON_CMDS_ON_DISCONNECT" ]] && 
-        [[ -z "$RCON_CMDS_FIRST_CONNECT" ]] && 
-        [[ -z "$RCON_CMDS_LAST_DISCONNECT" ]]
-      then
-        logRcon "No addition rcon commands are given, stopping rcon cmd service"
-        exit 0
-      fi
-      STATE=II
-    fi
-    ;;
-  XII)
-    CURR_CLIENTCONNECTIONS=$(java_clients_connections)
-    # First client connection
-    # Setting priority run order: on first client connection is usually to STOP maintence, aka DO THIS FIRST
-    if (( CURR_CLIENTCONNECTIONS > 0 )) && (( CLIENTCONNECTIONS == 0 )) && [[ "$RCON_CMDS_FIRST_CONNECT" ]]; then
-        logRcon "First Clients has Connected, running first connect cmds"
-        while read -r cmd; do
-          run_command "$cmd"
-        done <<< "$RCON_CMDS_FIRST_CONNECT"
-    fi
-
-    # When a client joins
-    if (( CURR_CLIENTCONNECTIONS > CLIENTCONNECTIONS )) && [[ "$RCON_CMDS_ON_CONNECT" ]]; then
-        logRcon "Clients have Connected, running connect cmds"
-        while read -r cmd; do
-          run_command "$cmd"
-        done <<< "$RCON_CMDS_ON_CONNECT"
-    # When a client leaves
-    elif (( CURR_CLIENTCONNECTIONS < CLIENTCONNECTIONS )) && [[ "$RCON_CMDS_ON_DISCONNECT" ]]; then
-        logRcon "Clients have Disconnected, running disconnect cmds"
-        while read -r cmd; do
-          run_command "$cmd"
-        done <<< "$RCON_CMDS_ON_DISCONNECT"
-    fi
-
-    # Last client connection
-    # Setting priority run order: on last client connection is usually to START maintence, aka DO THIS LAST
-    if (( CURR_CLIENTCONNECTIONS == 0 )) && (( CLIENTCONNECTIONS > 0 )) && [[ "$RCON_CMDS_LAST_DISCONNECT" ]]; then
-        logRcon "ALL Clients have Disconnected, running last disconnect cmds"
-        while read -r cmd; do
-          run_command "$cmd"
-        done <<< "$RCON_CMDS_LAST_DISCONNECT"
-    fi
-    CLIENTCONNECTIONS=$CURR_CLIENTCONNECTIONS
-    ;;
-  *)
-    logRcon "Error: invalid state: $STATE"
-    ;;
-  esac
-  sleep "$RCON_CMDS_PERIOD"
-done