fix: update configure_env.sh versions, descriptions, consolidate tokens
- GITEA_VERSION default 1.23 → 1.25, ACT_RUNNER_VERSION 0.2.11 → 0.3.0 - GITHUB_TOKEN description: "repo read" → "repo scope (read+write)" - BACKUP_STORAGE_PATH description: "Absolute path on Fedora for backup archives" - Remove GITHUB MIRROR section, move GITHUB_MIRROR_INTERVAL to REPOSITORIES - TOTAL_PROMPTS 57 → 56 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -64,7 +64,7 @@ get_env_val() {
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Prompt function
|
# Prompt function
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
TOTAL_PROMPTS=57
|
TOTAL_PROMPTS=56
|
||||||
CURRENT_PROMPT=0
|
CURRENT_PROMPT=0
|
||||||
LAST_SECTION=""
|
LAST_SECTION=""
|
||||||
|
|
||||||
@@ -228,7 +228,7 @@ prompt_var "UNRAID_SSH_PORT" "SSH port"
|
|||||||
prompt_var "UNRAID_GITEA_PORT" "Port Gitea web UI will listen on" port "3000" "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_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" "Path to SSH private key (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"
|
||||||
|
|
||||||
# --- FEDORA SERVER ---
|
# --- FEDORA SERVER ---
|
||||||
prompt_var "FEDORA_IP" "Static IP of Fedora server" ip "" "FEDORA SERVER"
|
prompt_var "FEDORA_IP" "Static IP of Fedora server" ip "" "FEDORA SERVER"
|
||||||
@@ -237,7 +237,7 @@ prompt_var "FEDORA_SSH_PORT" "SSH port"
|
|||||||
prompt_var "FEDORA_GITEA_PORT" "Port Gitea web UI will listen on" port "3000" "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_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" "Path to SSH private key (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"
|
||||||
|
|
||||||
# --- 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"
|
||||||
@@ -246,8 +246,8 @@ prompt_var "GITEA_ADMIN_EMAIL" "Admin email"
|
|||||||
prompt_var "GITEA_ORG_NAME" "Organization name (e.g. mifi-llc)" nonempty "" "GITEA SHARED CREDENTIALS"
|
prompt_var "GITEA_ORG_NAME" "Organization name (e.g. mifi-llc)" nonempty "" "GITEA SHARED CREDENTIALS"
|
||||||
prompt_var "GITEA_INSTANCE_NAME" "Display name for Gitea (e.g. MIFI Git)" nonempty "" "GITEA SHARED CREDENTIALS"
|
prompt_var "GITEA_INSTANCE_NAME" "Display name for Gitea (e.g. MIFI Git)" nonempty "" "GITEA SHARED CREDENTIALS"
|
||||||
prompt_var "GITEA_DB_TYPE" "Database type" nonempty "sqlite3" "GITEA SHARED CREDENTIALS"
|
prompt_var "GITEA_DB_TYPE" "Database type" nonempty "sqlite3" "GITEA SHARED CREDENTIALS"
|
||||||
prompt_var "GITEA_VERSION" "Gitea Docker image tag" nonempty "1.23" "GITEA SHARED CREDENTIALS"
|
prompt_var "GITEA_VERSION" "Gitea Docker image tag" nonempty "1.25" "GITEA SHARED CREDENTIALS"
|
||||||
prompt_var "ACT_RUNNER_VERSION" "act_runner version" nonempty "0.2.11" "GITEA SHARED CREDENTIALS"
|
prompt_var "ACT_RUNNER_VERSION" "act_runner version" nonempty "0.3.0" "GITEA SHARED CREDENTIALS"
|
||||||
|
|
||||||
# --- GITEA PRIMARY INSTANCE ---
|
# --- GITEA PRIMARY INSTANCE ---
|
||||||
prompt_var "GITEA_DOMAIN" "Public domain pointing to Unraid" nonempty "" "GITEA PRIMARY INSTANCE"
|
prompt_var "GITEA_DOMAIN" "Public domain pointing to Unraid" nonempty "" "GITEA PRIMARY INSTANCE"
|
||||||
@@ -256,12 +256,12 @@ prompt_var "GITEA_INTERNAL_URL" "Internal URL (e.g. http://IP:3000)"
|
|||||||
# --- GITEA BACKUP INSTANCE ---
|
# --- GITEA BACKUP INSTANCE ---
|
||||||
prompt_var "GITEA_BACKUP_INTERNAL_URL" "Internal URL of Fedora Gitea" url "" "GITEA BACKUP INSTANCE"
|
prompt_var "GITEA_BACKUP_INTERNAL_URL" "Internal URL of Fedora Gitea" url "" "GITEA BACKUP INSTANCE"
|
||||||
prompt_var "GITEA_BACKUP_MIRROR_INTERVAL" "How often Fedora pulls from Unraid" nonempty "8h" "GITEA BACKUP INSTANCE"
|
prompt_var "GITEA_BACKUP_MIRROR_INTERVAL" "How often Fedora pulls from Unraid" nonempty "8h" "GITEA BACKUP INSTANCE"
|
||||||
prompt_var "BACKUP_STORAGE_PATH" "Path on Fedora for backup archives" path "" "GITEA BACKUP INSTANCE"
|
prompt_var "BACKUP_STORAGE_PATH" "Absolute path on Fedora for backup archives" path "" "GITEA BACKUP INSTANCE"
|
||||||
prompt_var "BACKUP_RETENTION_COUNT" "Number of backup archives to keep" integer "5" "GITEA BACKUP INSTANCE"
|
prompt_var "BACKUP_RETENTION_COUNT" "Number of backup archives to keep" integer "5" "GITEA BACKUP INSTANCE"
|
||||||
|
|
||||||
# --- REPOSITORIES ---
|
# --- REPOSITORIES ---
|
||||||
prompt_var "GITHUB_USERNAME" "GitHub username or org name" nonempty "" "REPOSITORIES"
|
prompt_var "GITHUB_USERNAME" "GitHub username or org name" nonempty "" "REPOSITORIES"
|
||||||
prompt_var "GITHUB_TOKEN" "GitHub personal access token (repo read)" nonempty "" "REPOSITORIES"
|
prompt_var "GITHUB_TOKEN" "GitHub PAT with repo scope (read+write)" nonempty "" "REPOSITORIES"
|
||||||
prompt_var "REPO_1_NAME" "First repo name (exact match)" nonempty "" "REPOSITORIES"
|
prompt_var "REPO_1_NAME" "First repo name (exact match)" nonempty "" "REPOSITORIES"
|
||||||
prompt_var "REPO_2_NAME" "Second repo name (exact match)" nonempty "" "REPOSITORIES"
|
prompt_var "REPO_2_NAME" "Second repo name (exact match)" nonempty "" "REPOSITORIES"
|
||||||
prompt_var "REPO_3_NAME" "Third repo name (exact match)" nonempty "" "REPOSITORIES"
|
prompt_var "REPO_3_NAME" "Third repo name (exact match)" nonempty "" "REPOSITORIES"
|
||||||
@@ -269,6 +269,7 @@ prompt_var "MIGRATE_ISSUES" "Migrate GitHub issues" bool
|
|||||||
prompt_var "MIGRATE_LABELS" "Migrate GitHub labels" bool "true" "REPOSITORIES"
|
prompt_var "MIGRATE_LABELS" "Migrate GitHub labels" bool "true" "REPOSITORIES"
|
||||||
prompt_var "MIGRATE_MILESTONES" "Migrate GitHub milestones" bool "false" "REPOSITORIES"
|
prompt_var "MIGRATE_MILESTONES" "Migrate GitHub milestones" bool "false" "REPOSITORIES"
|
||||||
prompt_var "MIGRATE_WIKI" "Migrate GitHub wiki" bool "false" "REPOSITORIES"
|
prompt_var "MIGRATE_WIKI" "Migrate GitHub wiki" bool "false" "REPOSITORIES"
|
||||||
|
prompt_var "GITHUB_MIRROR_INTERVAL" "How often Gitea pushes to GitHub" nonempty "8h" "REPOSITORIES"
|
||||||
|
|
||||||
# --- RUNNERS ---
|
# --- RUNNERS ---
|
||||||
prompt_var "RUNNER_DEFAULT_IMAGE" "Default container image for docker runners" nonempty "catthehacker/ubuntu:act-latest" "RUNNERS"
|
prompt_var "RUNNER_DEFAULT_IMAGE" "Default container image for docker runners" nonempty "catthehacker/ubuntu:act-latest" "RUNNERS"
|
||||||
@@ -278,10 +279,6 @@ prompt_var "RUNNER_DEFAULT_DATA_PATH" "Default data path for remote (docker) run
|
|||||||
prompt_var "LOCAL_RUNNER_DATA_PATH" "Data path for native macOS runner" nonempty "~/gitea-runner" "RUNNERS"
|
prompt_var "LOCAL_RUNNER_DATA_PATH" "Data path for native macOS runner" nonempty "~/gitea-runner" "RUNNERS"
|
||||||
prompt_var "LOCAL_REGISTRY" "Local registry prefix (empty = Docker Hub)" optional "" "RUNNERS"
|
prompt_var "LOCAL_REGISTRY" "Local registry prefix (empty = Docker Hub)" optional "" "RUNNERS"
|
||||||
|
|
||||||
# --- GITHUB MIRROR ---
|
|
||||||
prompt_var "GITHUB_MIRROR_TOKEN" "GitHub PAT with repo write scope" nonempty "" "GITHUB MIRROR"
|
|
||||||
prompt_var "GITHUB_MIRROR_INTERVAL" "How often Gitea pushes to GitHub" nonempty "8h" "GITHUB MIRROR"
|
|
||||||
|
|
||||||
# --- NGINX REVERSE PROXY ---
|
# --- NGINX REVERSE PROXY ---
|
||||||
prompt_var "NGINX_CONTAINER_NAME" "Name of existing Nginx Docker container" nonempty "" "NGINX REVERSE PROXY"
|
prompt_var "NGINX_CONTAINER_NAME" "Name of existing Nginx Docker container" nonempty "" "NGINX REVERSE PROXY"
|
||||||
prompt_var "NGINX_CONF_PATH" "Host path to Nginx conf.d directory" path "" "NGINX REVERSE PROXY"
|
prompt_var "NGINX_CONF_PATH" "Host path to Nginx conf.d directory" path "" "NGINX REVERSE PROXY"
|
||||||
@@ -323,7 +320,7 @@ printf ' Fedora: %s@%s:%s\n' "$(get_env_val FEDORA_SSH_USER)" "$(get_env_va
|
|||||||
printf ' Gitea: %s (admin: %s, password: ****)\n' "$(get_env_val GITEA_DOMAIN)" "$(get_env_val GITEA_ADMIN_USER)"
|
printf ' Gitea: %s (admin: %s, password: ****)\n' "$(get_env_val GITEA_DOMAIN)" "$(get_env_val GITEA_ADMIN_USER)"
|
||||||
printf ' Org: %s\n' "$(get_env_val GITEA_ORG_NAME)"
|
printf ' Org: %s\n' "$(get_env_val GITEA_ORG_NAME)"
|
||||||
printf ' Repos: %s, %s, %s\n' "$(get_env_val REPO_1_NAME)" "$(get_env_val REPO_2_NAME)" "$(get_env_val REPO_3_NAME)"
|
printf ' Repos: %s, %s, %s\n' "$(get_env_val REPO_1_NAME)" "$(get_env_val REPO_2_NAME)" "$(get_env_val REPO_3_NAME)"
|
||||||
printf ' SSL: %s\n' "${COLLECTED_SSL_MODE}"
|
printf ' TLS/SSL: %s\n' "${COLLECTED_SSL_MODE}"
|
||||||
printf ' .env saved: %s\n\n' "$ENV_FILE"
|
printf ' .env saved: %s\n\n' "$ENV_FILE"
|
||||||
|
|
||||||
printf 'Next step: run %bsetup/macbook.sh%b to install local prerequisites.\n' "$C_BOLD" "$C_RESET"
|
printf 'Next step: run %bsetup/macbook.sh%b to install local prerequisites.\n' "$C_BOLD" "$C_RESET"
|
||||||
|
|||||||
Reference in New Issue
Block a user