fix: remove unused FEDORA_CADDY_IP from validation and wizard

No phase script deploys Caddy on Fedora — only Unraid gets a Caddy
container. Removed from .env.example, validation arrays, preflight
required vars, IP ping check, wizard prompts, and doc references.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
S
2026-03-01 11:39:15 -05:00
parent 33f9845dd6
commit b573b77ab1
6 changed files with 54 additions and 9 deletions

View File

@@ -209,7 +209,7 @@ _ENV_VAR_NAMES=(
UNRAID_MACVLAN_PARENT UNRAID_MACVLAN_SUBNET UNRAID_MACVLAN_GATEWAY
UNRAID_MACVLAN_IP_RANGE UNRAID_GITEA_IP UNRAID_CADDY_IP
FEDORA_MACVLAN_PARENT FEDORA_MACVLAN_SUBNET FEDORA_MACVLAN_GATEWAY
FEDORA_MACVLAN_IP_RANGE FEDORA_GITEA_IP FEDORA_CADDY_IP
FEDORA_MACVLAN_IP_RANGE FEDORA_GITEA_IP
GITEA_ADMIN_USER GITEA_ADMIN_PASSWORD GITEA_ADMIN_EMAIL
GITEA_ORG_NAME GITEA_INSTANCE_NAME GITEA_DB_TYPE GITEA_VERSION ACT_RUNNER_VERSION
GITEA_DOMAIN GITEA_INTERNAL_URL
@@ -231,7 +231,7 @@ _ENV_VAR_TYPES=(
nonempty nonempty ip
nonempty ip ip
nonempty nonempty ip
nonempty ip ip
nonempty ip
nonempty password email
nonempty nonempty db_type nonempty nonempty
nonempty url
@@ -564,6 +564,53 @@ render_template() {
envsubst "$vars" < "$src" > "$dest"
}
# ---------------------------------------------------------------------------
# Template block helpers — conditional block stripping and DB-specific vars
# ---------------------------------------------------------------------------
# Strip conditional blocks from a rendered file.
# Usage: strip_template_block <file> <start_marker> <end_marker>
strip_template_block() {
local file="$1" start="$2" end="$3"
sed -i.bak "/${start}/,/${end}/d" "$file"
rm -f "${file}.bak"
}
# Set DB-specific variables for docker-compose template rendering.
# Requires GITEA_DB_TYPE, GITEA_DB_USER, GITEA_DB_PASSWD, GITEA_DB_NAME in env.
# Exports: DB_DOCKER_IMAGE, DB_ENV_VARS, DB_HEALTHCHECK, DB_DATA_DIR
set_db_vars() {
case "${GITEA_DB_TYPE}" in
postgres)
DB_DOCKER_IMAGE="postgres:16-alpine"
DB_ENV_VARS=" - POSTGRES_USER=${GITEA_DB_USER}
- POSTGRES_PASSWORD=${GITEA_DB_PASSWD}
- POSTGRES_DB=${GITEA_DB_NAME}"
DB_HEALTHCHECK='["CMD-SHELL", "pg_isready -U '"${GITEA_DB_USER}"'"]'
DB_DATA_DIR="postgresql/data"
;;
mysql)
DB_DOCKER_IMAGE="mysql:8.0"
DB_ENV_VARS=" - MYSQL_ROOT_PASSWORD=${GITEA_DB_PASSWD}
- MYSQL_DATABASE=${GITEA_DB_NAME}
- MYSQL_USER=${GITEA_DB_USER}
- MYSQL_PASSWORD=${GITEA_DB_PASSWD}"
DB_HEALTHCHECK='["CMD", "mysqladmin", "ping", "-h", "localhost"]'
DB_DATA_DIR="mysql"
;;
mssql)
DB_DOCKER_IMAGE="mcr.microsoft.com/mssql/server:2022-latest"
DB_ENV_VARS=" - ACCEPT_EULA=Y
- SA_PASSWORD=${GITEA_DB_PASSWD}"
# shellcheck disable=SC2089,SC2016
DB_HEALTHCHECK='["CMD-SHELL", "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P '"'"'${GITEA_DB_PASSWD}'"'"' -Q \"SELECT 1\" -C -N"]'
DB_DATA_DIR="mssql/data"
;;
esac
# shellcheck disable=SC2090
export DB_DOCKER_IMAGE DB_ENV_VARS DB_HEALTHCHECK DB_DATA_DIR
}
# ---------------------------------------------------------------------------
# Polling / waiting
# ---------------------------------------------------------------------------