privacy-in-design/gitea-migration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: adjust total prompt count and remove unused database IP prompts in configuration script

Browse Source
This commit is contained in:
S
2026-03-02 12:03:50 -05:00
parent 8082603e64
commit 4e7070001e
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
setup/configure_env.sh
View File

@@ -64,8 +64,8 @@ get_env_val() {
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# Prompt function # Prompt function
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# Base prompt count (58 fixed + 3 TLS conditional slots — repo/DB prompts added dynamically) # Base prompt count (56 fixed + 3 TLS conditional slots — repo/DB prompts added dynamically)
TOTAL_PROMPTS=61 TOTAL_PROMPTS=59
CURRENT_PROMPT=0 CURRENT_PROMPT=0
LAST_SECTION="" LAST_SECTION=""
@@ -252,14 +252,12 @@ prompt_var "UNRAID_MACVLAN_SUBNET" "Unraid LAN subnet (e.g. 192.168.1.0/24)"
prompt_var "UNRAID_MACVLAN_GATEWAY" "Unraid LAN gateway (e.g. 192.168.1.1)" ip "" "DOCKER NETWORKING" prompt_var "UNRAID_MACVLAN_GATEWAY" "Unraid LAN gateway (e.g. 192.168.1.1)" ip "" "DOCKER NETWORKING"
prompt_var "UNRAID_MACVLAN_IP_RANGE" "Unraid container IP range (e.g. 192.168.1.192/28)" nonempty "" "DOCKER NETWORKING" prompt_var "UNRAID_MACVLAN_IP_RANGE" "Unraid container IP range (e.g. 192.168.1.192/28)" nonempty "" "DOCKER NETWORKING"
prompt_var "UNRAID_GITEA_IP" "Unraid Gitea container IP" ip "" "DOCKER NETWORKING" prompt_var "UNRAID_GITEA_IP" "Unraid Gitea container IP" ip "" "DOCKER NETWORKING"
prompt_var "UNRAID_DB_IP" "Unraid DB container IP (empty if sqlite3)" optional "" "DOCKER NETWORKING"
prompt_var "UNRAID_CADDY_IP" "Unraid Caddy container IP" ip "" "DOCKER NETWORKING" prompt_var "UNRAID_CADDY_IP" "Unraid Caddy container IP" ip "" "DOCKER NETWORKING"
prompt_var "FEDORA_MACVLAN_PARENT" "Fedora host NIC (e.g. eth0)" nonempty "" "DOCKER NETWORKING" prompt_var "FEDORA_MACVLAN_PARENT" "Fedora host NIC (e.g. eth0)" nonempty "" "DOCKER NETWORKING"
prompt_var "FEDORA_MACVLAN_SUBNET" "Fedora LAN subnet (CIDR)" nonempty "" "DOCKER NETWORKING" prompt_var "FEDORA_MACVLAN_SUBNET" "Fedora LAN subnet (CIDR)" nonempty "" "DOCKER NETWORKING"
prompt_var "FEDORA_MACVLAN_GATEWAY" "Fedora LAN gateway" ip "" "DOCKER NETWORKING" prompt_var "FEDORA_MACVLAN_GATEWAY" "Fedora LAN gateway" ip "" "DOCKER NETWORKING"
prompt_var "FEDORA_MACVLAN_IP_RANGE" "Fedora container IP range" nonempty "" "DOCKER NETWORKING" prompt_var "FEDORA_MACVLAN_IP_RANGE" "Fedora container IP range" nonempty "" "DOCKER NETWORKING"
prompt_var "FEDORA_GITEA_IP" "Fedora Gitea container IP" ip "" "DOCKER NETWORKING" prompt_var "FEDORA_GITEA_IP" "Fedora Gitea container IP" ip "" "DOCKER NETWORKING"
prompt_var "FEDORA_DB_IP" "Fedora DB container IP (empty if sqlite3)" optional "" "DOCKER NETWORKING"
# --- GITEA SHARED CREDENTIALS --- # --- GITEA SHARED CREDENTIALS ---
prompt_var "GITEA_ADMIN_USER" "Admin username (same on both instances)" nonempty "" "GITEA SHARED CREDENTIALS" prompt_var "GITEA_ADMIN_USER" "Admin username (same on both instances)" nonempty "" "GITEA SHARED CREDENTIALS"
@@ -274,7 +272,7 @@ COLLECTED_DB_TYPE=$(get_env_val "GITEA_DB_TYPE" "sqlite3")
if [[ "$COLLECTED_DB_TYPE" != "sqlite3" ]]; then if [[ "$COLLECTED_DB_TYPE" != "sqlite3" ]]; then
# Update total BEFORE showing DB prompts so progress counter is accurate # Update total BEFORE showing DB prompts so progress counter is accurate
TOTAL_PROMPTS=$((TOTAL_PROMPTS + 5)) TOTAL_PROMPTS=$((TOTAL_PROMPTS + 4))
# Determine default port based on DB type # Determine default port based on DB type
case "$COLLECTED_DB_TYPE" in case "$COLLECTED_DB_TYPE" in
mysql) db_port_default="3306" ;; mysql) db_port_default="3306" ;;
@@ -282,7 +280,6 @@ if [[ "$COLLECTED_DB_TYPE" != "sqlite3" ]]; then
mssql) db_port_default="1433" ;; mssql) db_port_default="1433" ;;
*) db_port_default="" ;; *) db_port_default="" ;;
esac esac
prompt_var "GITEA_DB_HOST" "Database host (container IP or hostname)" nonempty "" "DATABASE"
prompt_var "GITEA_DB_PORT" "Database port" port "$db_port_default" "DATABASE" prompt_var "GITEA_DB_PORT" "Database port" port "$db_port_default" "DATABASE"
prompt_var "GITEA_DB_NAME" "Database name" nonempty "gitea" "DATABASE" prompt_var "GITEA_DB_NAME" "Database name" nonempty "gitea" "DATABASE"
prompt_var "GITEA_DB_USER" "Database user" nonempty "gitea" "DATABASE" prompt_var "GITEA_DB_USER" "Database user" nonempty "gitea" "DATABASE"