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

feat: replace port prompts with macvlan networking in configure_env.sh

Browse Source 
Remove UNRAID_GITEA_PORT, UNRAID_GITEA_SSH_PORT, FEDORA_GITEA_PORT,
FEDORA_GITEA_SSH_PORT prompts. Add DOCKER NETWORKING section with 14
macvlan prompts (parent NIC, subnet, gateway, IP range, container
IPs for gitea/db/caddy on each host). Update TOTAL_PROMPTS to 59.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
S
2026-03-01 10:26:31 -05:00
parent 3b98844973
commit df297334ff
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
setup/configure_env.sh
View File

@@ -64,8 +64,8 @@ get_env_val() {
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# Prompt function # Prompt function
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# Base prompt count (fixed prompts only — repo prompts added dynamically) # Base prompt count (fixed prompts only — repo/DB prompts added dynamically)
TOTAL_PROMPTS=52 TOTAL_PROMPTS=59
CURRENT_PROMPT=0 CURRENT_PROMPT=0
LAST_SECTION="" LAST_SECTION=""
@@ -230,8 +230,6 @@ printf 'Auto-populated variables (tokens) will be skipped.\n'
prompt_var "UNRAID_IP" "Static IP of Unraid server" ip "" "UNRAID SERVER" prompt_var "UNRAID_IP" "Static IP of Unraid server" ip "" "UNRAID SERVER"
prompt_var "UNRAID_SSH_USER" "SSH username for Unraid" nonempty "" "UNRAID SERVER" prompt_var "UNRAID_SSH_USER" "SSH username for Unraid" nonempty "" "UNRAID SERVER"
prompt_var "UNRAID_SSH_PORT" "SSH port" port "22" "UNRAID SERVER" prompt_var "UNRAID_SSH_PORT" "SSH port" port "22" "UNRAID SERVER"
prompt_var "UNRAID_GITEA_PORT" "Port Gitea web UI will listen on" port "3000" "UNRAID SERVER"
prompt_var "UNRAID_GITEA_SSH_PORT" "Port for git-over-SSH" port "2222" "UNRAID SERVER"
prompt_var "UNRAID_GITEA_DATA_PATH" "Absolute path on NVMe for Gitea data" path "" "UNRAID SERVER" prompt_var "UNRAID_GITEA_DATA_PATH" "Absolute path on NVMe for Gitea data" path "" "UNRAID SERVER"
prompt_var "UNRAID_SSH_KEY" "Absolute path to SSH private key, e.g. /Users/you/.ssh/id_ed25519 (empty = ssh-agent)" optional "" "UNRAID SERVER" prompt_var "UNRAID_SSH_KEY" "Absolute path to SSH private key, e.g. /Users/you/.ssh/id_ed25519 (empty = ssh-agent)" optional "" "UNRAID SERVER"
@@ -239,11 +237,25 @@ prompt_var "UNRAID_SSH_KEY" "Absolute path to SSH private key, e.g. /User
prompt_var "FEDORA_IP" "Static IP of Fedora server" ip "" "FEDORA SERVER" prompt_var "FEDORA_IP" "Static IP of Fedora server" ip "" "FEDORA SERVER"
prompt_var "FEDORA_SSH_USER" "SSH username for Fedora" nonempty "" "FEDORA SERVER" prompt_var "FEDORA_SSH_USER" "SSH username for Fedora" nonempty "" "FEDORA SERVER"
prompt_var "FEDORA_SSH_PORT" "SSH port" port "22" "FEDORA SERVER" prompt_var "FEDORA_SSH_PORT" "SSH port" port "22" "FEDORA SERVER"
prompt_var "FEDORA_GITEA_PORT" "Port Gitea web UI will listen on" port "3000" "FEDORA SERVER"
prompt_var "FEDORA_GITEA_SSH_PORT" "Port for git-over-SSH" port "2222" "FEDORA SERVER"
prompt_var "FEDORA_GITEA_DATA_PATH" "Absolute path on NVMe for Gitea data" path "" "FEDORA SERVER" prompt_var "FEDORA_GITEA_DATA_PATH" "Absolute path on NVMe for Gitea data" path "" "FEDORA SERVER"
prompt_var "FEDORA_SSH_KEY" "Absolute path to SSH private key, e.g. /Users/you/.ssh/id_ed25519 (empty = ssh-agent)" optional "" "FEDORA SERVER" prompt_var "FEDORA_SSH_KEY" "Absolute path to SSH private key, e.g. /Users/you/.ssh/id_ed25519 (empty = ssh-agent)" optional "" "FEDORA SERVER"
# --- DOCKER NETWORKING (macvlan) ---
prompt_var "UNRAID_MACVLAN_PARENT" "Unraid host NIC (e.g. br0, eth0)" nonempty "" "DOCKER NETWORKING"
prompt_var "UNRAID_MACVLAN_SUBNET" "Unraid LAN subnet (e.g. 192.168.1.0/24)" nonempty "" "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_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 "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_GATEWAY" "Fedora LAN gateway" ip "" "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_DB_IP" "Fedora DB container IP (empty if sqlite3)" optional "" "DOCKER NETWORKING"
prompt_var "FEDORA_CADDY_IP" "Fedora Caddy container IP" ip "" "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"
prompt_var "GITEA_ADMIN_PASSWORD" "Admin password (min 8 chars)" password "" "GITEA SHARED CREDENTIALS" prompt_var "GITEA_ADMIN_PASSWORD" "Admin password (min 8 chars)" password "" "GITEA SHARED CREDENTIALS"