From 8ebb42472b848faa016ba71551141c674f97f8f8 Mon Sep 17 00:00:00 2001 From: Gerrit Gogel Date: Mon, 23 Oct 2023 20:00:57 +0200 Subject: [PATCH] change hostname environment variable names --- seafile-caddy/Caddyfile | 10 +++++----- seafile-caddy/Dockerfile | 6 +++--- seafile-caddy/scripts/swarm-dns.sh | 8 ++++---- seahub/Dockerfile | 2 +- seahub/scripts/start.sh | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/seafile-caddy/Caddyfile b/seafile-caddy/Caddyfile index ed27785..505a6a1 100644 --- a/seafile-caddy/Caddyfile +++ b/seafile-caddy/Caddyfile @@ -3,27 +3,27 @@ } http:// https:// { - reverse_proxy {$SEAHUB_SERVER_HOST}:8000 { + reverse_proxy {$SEAHUB_HOSTNAME}:8000 { lb_policy header X-Forwarded-For trusted_proxies private_ranges } - reverse_proxy /seafdav* {$SEAFILE_SERVER_HOST}:8080 { + reverse_proxy /seafdav* {$SEAFILE_SERVER_HOSTNAME}:8080 { header_up Destination https:// http:// trusted_proxies private_ranges } handle_path /seafhttp* { uri strip_prefix seafhttp - reverse_proxy {$SEAFILE_SERVER_HOST}:8082 { + reverse_proxy {$SEAFILE_SERVER_HOSTNAME}:8082 { trusted_proxies private_ranges } } handle_path /notification* { uri strip_prefix notification - reverse_proxy {$SEAFILE_SERVER_HOST}:8083 { + reverse_proxy {$SEAFILE_SERVER_HOSTNAME}:8083 { trusted_proxies private_ranges } } - reverse_proxy /media/* {$SEAHUB_MEDIA_SERVER_HOST}:80 { + reverse_proxy /media/* {$SEAHUB_MEDIA_HOSTNAME}:80 { lb_policy header X-Forwarded-For trusted_proxies private_ranges } diff --git a/seafile-caddy/Dockerfile b/seafile-caddy/Dockerfile index c61f41b..2d43b20 100644 --- a/seafile-caddy/Dockerfile +++ b/seafile-caddy/Dockerfile @@ -8,8 +8,8 @@ COPY Caddyfile /etc/caddy/Caddyfile COPY scripts /scripts RUN chmod u+x /scripts/* -ENV SEAFILE_SERVER_HOST=seafile-server -ENV SEAHUB_SERVER_HOST=seahub -ENV SEAHUB_MEDIA_SERVER_HOST=seahub-media +ENV SEAFILE_SERVER_HOSTNAME=seafile-server +ENV SEAHUB_HOSTNAME=seahub +ENV SEAHUB_MEDIA_HOSTNAME=seahub-media CMD ["/scripts/start.sh"] diff --git a/seafile-caddy/scripts/swarm-dns.sh b/seafile-caddy/scripts/swarm-dns.sh index 28d9b79..7ba1361 100644 --- a/seafile-caddy/scripts/swarm-dns.sh +++ b/seafile-caddy/scripts/swarm-dns.sh @@ -6,13 +6,13 @@ if [ "$SWARM_DNS" = true ]; then while true; do - SEAHUB_IPS=$(dig +short $SEAHUB_SERVER_HOST | sed -e 's/$/:8000/' | tr ' ' '\n' | sort | tr '\n' ' ') - SEAHUB_MEDIA_IPS=$(dig +short $SEAHUB_MEDIA_SERVER_HOST | sed -e 's/$/:80/' | tr ' ' '\n' | sort | tr '\n' ' ') + SEAHUB_IPS=$(dig +short $SEAHUB_HOSTNAME | sed -e 's/$/:8000/' | tr ' ' '\n' | sort | tr '\n' ' ') + SEAHUB_MEDIA_IPS=$(dig +short $SEAHUB_MEDIA_HOSTNAME | sed -e 's/$/:80/' | tr ' ' '\n' | sort | tr '\n' ' ') cp /etc/caddy/Caddyfile.default /etc/caddy/Caddyfile.tmp - sed -i "s/$SEAHUB_SERVER_HOST:8000/$(echo $SEAHUB_IPS)/g" /etc/caddy/Caddyfile.tmp - sed -i "s/$SEAHUB_MEDIA_SERVER_HOST:80/$(echo $SEAHUB_MEDIA_IPS)/g" /etc/caddy/Caddyfile.tmp + sed -i "s/$SEAHUB_HOSTNAME:8000/$(echo $SEAHUB_IPS)/g" /etc/caddy/Caddyfile.tmp + sed -i "s/$SEAHUB_MEDIA_HOSTNAME:80/$(echo $SEAHUB_MEDIA_IPS)/g" /etc/caddy/Caddyfile.tmp if ! diff -q "/etc/caddy/Caddyfile" "/etc/caddy/Caddyfile.tmp"; then rm -f /etc/caddy/Caddyfile diff --git a/seahub/Dockerfile b/seahub/Dockerfile index 8d1d6da..2df9a80 100644 --- a/seahub/Dockerfile +++ b/seahub/Dockerfile @@ -89,7 +89,7 @@ ENV INNER_FILE_SERVER_ROOT=http://seafile-server:8082 ENV SEAHUB_LOG_DIR=/opt/seafile/logs ENV SEAFILE_ADMIN_EMAIL=me@example.com ENV SEAFILE_ADMIN_PASSWORD=asecret -ENV SEAFILE_SERVER_HOST=seafile-server +ENV SEAFILE_SERVER_HOSTNAME=seafile-server ENV PYTHON=python3 ENV SEAHUB_DIR=/opt/seafile/seafile-server-latest/seahub diff --git a/seahub/scripts/start.sh b/seahub/scripts/start.sh index 1f0142e..6472be5 100644 --- a/seahub/scripts/start.sh +++ b/seahub/scripts/start.sh @@ -13,20 +13,20 @@ function start_seahub { function start_socat { mkdir -p /opt/seafile/seafile-server-latest/runtime while true; do - while ! nc -z ${SEAFILE_SERVER_HOST} 8001 2>/dev/null; do + while ! nc -z ${SEAFILE_SERVER_HOSTNAME} 8001 2>/dev/null; do sleep 1 done echo "Starting socat..." - socat -d -d UNIX-LISTEN:/opt/seafile/seafile-server-latest/runtime/seafile.sock,fork,unlink-early TCP:${SEAFILE_SERVER_HOST}:8001,forever,keepalive,keepidle=10,keepintvl=10,keepcnt=2 + socat -d -d UNIX-LISTEN:/opt/seafile/seafile-server-latest/runtime/seafile.sock,fork,unlink-early TCP:${SEAFILE_SERVER_HOSTNAME}:8001,forever,keepalive,keepidle=10,keepintvl=10,keepcnt=2 done } function watch_server { while true; do sleep 2 - if ! nc -z ${SEAFILE_SERVER_HOST} 8082 2>/dev/null; then + if ! nc -z ${SEAFILE_SERVER_HOSTNAME} 8082 2>/dev/null; then /opt/seafile/seafile-server-latest/seahub.sh stop - while ! nc -z ${SEAFILE_SERVER_HOST} 8082 2>/dev/null; do + while ! nc -z ${SEAFILE_SERVER_HOSTNAME} 8082 2>/dev/null; do sleep 1 done start_seahub &