From 78c24b580e4cf2c0ad6a779016011273c02f4231 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Mon, 8 Jul 2024 12:29:07 -0500 Subject: [PATCH] Revert "Add use-proxy support to health extra args (#2973)" This reverts commit 11d8d917f23689c5267b9b7c0f99419310ab9c5f. --- docs/misc/autopause-autostop/autostop.md | 5 +---- scripts/start-finalExec | 6 ------ 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/docs/misc/autopause-autostop/autostop.md b/docs/misc/autopause-autostop/autostop.md index 88ed0c0f..bbb043c8 100644 --- a/docs/misc/autopause-autostop/autostop.md +++ b/docs/misc/autopause-autostop/autostop.md @@ -2,7 +2,7 @@ An option to stop the server after a specified time has been added for niche applications (e.g. billing saving on AWS Fargate). The function is incompatible with the Autopause functionality, as they basically cancel out each other. -!!! note +!!! note the docker container variables have to be set accordingly (restart policy set to "no") and that the container has to be manually restarted. @@ -25,6 +25,3 @@ The following environment variables define the behavior of auto-stopping: describes period of the daemonized state machine, that handles the stopping of the server > To troubleshoot, add `DEBUG_AUTOSTOP=true` to see additional output - -## Proxy Support -If you make use of PROXY Protocol, i.e. through something like HAProxy or Fly.io, you will need to enable it in your variety of server's configuration, and then set the `USES_PROXY_PROTOCOL` envar to `true`. This lets Autostop monitor the server, where it otherwise wouldn't diff --git a/scripts/start-finalExec b/scripts/start-finalExec index cdfdfbea..060c0ff0 100755 --- a/scripts/start-finalExec +++ b/scripts/start-finalExec @@ -227,12 +227,6 @@ MC_HEALTH_EXTRA_ARGS=( --use-server-list-ping ) " > /data/.mc-health.env -elif isTrue "$USES_PROXY_PROTOCOL"; then - echo " -MC_HEALTH_EXTRA_ARGS=( - --use-proxy -) - " > /data/.mc-health.env else rm -f /data/.mc-health.env fi