From d93c01f3686c3b977ce55f9aaa4289274cb828ab Mon Sep 17 00:00:00 2001 From: Zoey Date: Sat, 8 Apr 2023 13:28:19 +0200 Subject: [PATCH 1/3] apache healthcheck, check localhost apacheport with every apache port Signed-off-by: Zoey --- Containers/apache/healthcheck.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Containers/apache/healthcheck.sh b/Containers/apache/healthcheck.sh index 436091b2..e23585bc 100644 --- a/Containers/apache/healthcheck.sh +++ b/Containers/apache/healthcheck.sh @@ -2,8 +2,7 @@ nc -z "$NEXTCLOUD_HOST" 9000 || exit 0 nc -z localhost 8000 || exit 1 -if [ "$APACHE_PORT" != '443' ]; then - nc -z localhost "$APACHE_PORT" || exit 1 -else +nc -z localhost "$APACHE_PORT" || exit 1 +if [ "$APACHE_PORT" == '443' ]; then nc -z "$NC_DOMAIN" "$APACHE_PORT" || exit 1 fi From 46ec1ea7f59e56c81b015d31b7d7dca2bd6997cc Mon Sep 17 00:00:00 2001 From: Zoey Date: Mon, 10 Apr 2023 17:50:58 +0200 Subject: [PATCH 2/3] always check port 443 Signed-off-by: Zoey --- Containers/apache/healthcheck.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Containers/apache/healthcheck.sh b/Containers/apache/healthcheck.sh index e23585bc..4e8a2401 100644 --- a/Containers/apache/healthcheck.sh +++ b/Containers/apache/healthcheck.sh @@ -3,6 +3,4 @@ nc -z "$NEXTCLOUD_HOST" 9000 || exit 0 nc -z localhost 8000 || exit 1 nc -z localhost "$APACHE_PORT" || exit 1 -if [ "$APACHE_PORT" == '443' ]; then - nc -z "$NC_DOMAIN" "$APACHE_PORT" || exit 1 -fi +nc -z "$NC_DOMAIN" "$APACHE_PORT" || exit 1 From 904d23147c594ca6a25e35b42aa6bee66331e5ae Mon Sep 17 00:00:00 2001 From: Zoey Date: Tue, 11 Apr 2023 10:54:02 +0200 Subject: [PATCH 3/3] add suggestion Co-authored-by: Simon L. Signed-off-by: Zoey --- Containers/apache/healthcheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containers/apache/healthcheck.sh b/Containers/apache/healthcheck.sh index 4e8a2401..835ec4d4 100644 --- a/Containers/apache/healthcheck.sh +++ b/Containers/apache/healthcheck.sh @@ -3,4 +3,4 @@ nc -z "$NEXTCLOUD_HOST" 9000 || exit 0 nc -z localhost 8000 || exit 1 nc -z localhost "$APACHE_PORT" || exit 1 -nc -z "$NC_DOMAIN" "$APACHE_PORT" || exit 1 +nc -z "$NC_DOMAIN" 443 || exit 1