diff --git a/files/scripts/bootstrap.sh b/files/scripts/bootstrap.sh index 1b512a2..6c244a1 100644 --- a/files/scripts/bootstrap.sh +++ b/files/scripts/bootstrap.sh @@ -10,9 +10,9 @@ function usage() { echo "" echo "-h,--help: print this help message" echo "--network-forge-flow-subnet: The subnet for the forge flow docker network. (default: 172.20.0.0/24)" + echo "--root-domain: The root domain of the traefik. (default: localhost)" echo "--traefik-container-ipv4-address: The IPv4 address of the traefik container. (default: 172.20.0.2)" echo "--traefik-check-new-version: Set to true to enable automatic checks for new Traefik versions. (default: true)" - echo "--traefik-domain: The root domain of the traefik. (default: localhost)" echo "--traefik-external-ssh-port: The external SSH port to expose for Gitea. (default: 22)" } @@ -28,6 +28,11 @@ while [[ $# -gt 0 ]]; do shift shift ;; + --root-domain) + ROOT_DOMAIN=$2 + shift + shift + ;; --traefik-container-ipv4-address) TRAEFIK_CONTAINER_IPV4_ADDRESS=$2 shift @@ -38,11 +43,6 @@ while [[ $# -gt 0 ]]; do shift shift ;; - --traefik-domain) - TRAEFIK_DOMAIN=$2 - shift - shift - ;; --traefik-external-ssh-port) TRAEFIK_EXTERNAL_SSH_PORT=$2 shift @@ -75,9 +75,9 @@ DOCKER_ROOT="/home/${FLOW_USERNAME}/Docker/flow" export NETWORK_FORGE_FLOW_SUBNET="${NETWORK_FORGE_FLOW_SUBNET:-172.20.0.0/24}" +export ROOT_DOMAIN="${ROOT_DOMAIN:-localhost}" export TRAEFIK_DOCKER_DIR="${DOCKER_ROOT}/traefik" export TRAEFIK_CHECK_NEW_VERSION="${TRAEFIK_CHECK_NEW_VERSION:-true}" -export TRAEFIK_DOMAIN="${TRAEFIK_DOMAIN:-localhost}" export TRAEFIK_EXTERNAL_SSH_PORT="${TRAEFIK_EXTERNAL_SSH_PORT:-22}" export TRAEFIK_LOG_LEVEL="${TRAEFIK_LOG_LEVEL:-info}" export TRAEFIK_SEND_ANONYMOUS_USAGE="${TRAEFIK_SEND_ANONYMOUS_USAGE:-false}" diff --git a/files/traefik/dynamic_dashboard.yaml b/files/traefik/dynamic_dashboard.yaml index 6e08b3c..0e3009c 100644 --- a/files/traefik/dynamic_dashboard.yaml +++ b/files/traefik/dynamic_dashboard.yaml @@ -4,6 +4,6 @@ http: dashboard: entryPoints: - "https" - rule: "Host(`${TRAEFIK_DOMAIN}`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))" + rule: "Host(`${ROOT_DOMAIN}`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))" service: "api@internal" tls: {}