From ceba76df85be7ee432dceae938601750d9b69d60 Mon Sep 17 00:00:00 2001
From: tim <tim@stack.local>
Date: Wed, 22 Jul 2026 12:48:07 -0700
Subject: [PATCH] Map Tweaknews secret variable aliases in configure-usenet

Accept TWEAKNEWSLOGIN, TWEAKNEWSPASSWORD, TWEAKNEWSAPI (as host),
TWEAKNEWSSSLPORT, and TWEAKNEWSCONNECTIONS from secrets/.env.
---
 scripts/configure-usenet.sh | 25 ++++++++++++---------
 secrets/.env.example        | 45 ++++++++++++++++++-------------------
 2 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/scripts/configure-usenet.sh b/scripts/configure-usenet.sh
index 90f2c14..e6aeb47 100755
--- a/scripts/configure-usenet.sh
+++ b/scripts/configure-usenet.sh
@@ -23,21 +23,26 @@ set -a
 source "$SECRETS_FILE"
 set +a
 
-# Accept both clean names and the keys already in secrets/.env
-NZBGEEK_API_KEY="${NZBGEEK_API_KEY:-${NZBKEEPKEY:-}}"
+# Accept clean names AND the variable names used in secrets/.env
+# NZBgeek
+NZBGEEK_API_KEY="${NZBGEEK_API_KEY:-${NZBKEEPKEY:-${NZBGEEKKEY:-}}}"
 NZBGEEK_URL="${NZBGEEK_URL:-${NZBGEEKAPI:-https://api.nzbgeek.info/}}"
+NZBGEEK_USERNAME="${NZBGEEK_USERNAME:-${NZBGEEKUSERNAME:-}}"
+
+# Newshosting (provider host often in NEWSHOSTINGAPI)
 NEWSHOSTING_HOST="${NEWSHOSTING_HOST:-${NEWSHOSTINGAPI:-news.newshosting.com}}"
 NEWSHOSTING_PORT="${NEWSHOSTING_PORT:-${NEWSHOSTINGSSLPORT:-563}}"
-[[ "$NEWSHOSTING_PORT" == "653" ]] && NEWSHOSTING_PORT=563   # common typo
+[[ "$NEWSHOSTING_PORT" == "653" ]] && NEWSHOSTING_PORT=563   # common typo for 563
 NEWSHOSTING_USER="${NEWSHOSTING_USER:-${NEWSHOSTINGUSER:-}}"
-NEWSHOSTING_PASS="${NEWSHOSTING_PASS:-${HNEWSHOSTINGPASS:-${NEWSHOSTINGPASS:-}}}"
-NEWSHOSTING_CONNECTIONS="${NEWSHOSTING_CONNECTIONS:-20}"
+NEWSHOSTING_PASS="${NEWSHOSTING_PASS:-${HNEWSHOSTINGPASS:-${NEWSHOSTINGPASS:-${NEWSHOSTINGPASSWORD:-}}}}"
+NEWSHOSTING_CONNECTIONS="${NEWSHOSTING_CONNECTIONS:-${NEWSHOSTINGCONNECTIONS:-20}}"
 
-TWEAKNEWS_HOST="${TWEAKNEWS_HOST:-news.tweaknews.eu}"
-TWEAKNEWS_PORT="${TWEAKNEWS_PORT:-563}"
-TWEAKNEWS_USER="${TWEAKNEWS_USER:-${TWEAKNEWSUSER:-}}"
-TWEAKNEWS_PASS="${TWEAKNEWS_PASS:-${TWEAKNEWSPASS:-}}"
-TWEAKNEWS_CONNECTIONS="${TWEAKNEWS_CONNECTIONS:-10}"
+# Tweaknews (secrets use TWEAKNEWSLOGIN / TWEAKNEWSPASSWORD / TWEAKNEWSAPI as host)
+TWEAKNEWS_HOST="${TWEAKNEWS_HOST:-${TWEAKNEWSAPI:-${TWEAKNEWSHOST:-news.tweaknews.eu}}}"
+TWEAKNEWS_PORT="${TWEAKNEWS_PORT:-${TWEAKNEWSSSLPORT:-${TWEAKNEWSPORT:-563}}}"
+TWEAKNEWS_USER="${TWEAKNEWS_USER:-${TWEAKNEWSLOGIN:-${TWEAKNEWSUSER:-${TWEAKNEWSUSERNAME:-}}}}"
+TWEAKNEWS_PASS="${TWEAKNEWS_PASS:-${TWEAKNEWSPASSWORD:-${TWEAKNEWSPASS:-}}}"
+TWEAKNEWS_CONNECTIONS="${TWEAKNEWS_CONNECTIONS:-${TWEAKNEWSCONNECTIONS:-10}}"
 
 find_api_key() {
   local f
diff --git a/secrets/.env.example b/secrets/.env.example
index 2db0a9e..9d2eb38 100644
--- a/secrets/.env.example
+++ b/secrets/.env.example
@@ -1,27 +1,26 @@
 # Copy to secrets/.env and fill in. NEVER commit secrets/.env
-# Used by scripts/configure-usenet.sh and as a personal password vault.
+# scripts/configure-usenet.sh accepts these names (and a few aliases).
 
-# --- NZBgeek (indexer — wire in Prowlarr) ---
-NZBGEEK_USERNAME=
-NZBGEEK_EMAIL=
-# API key from nzbgeek.info account (not the base URL)
-NZBGEEK_API_KEY=
-# Optional base URL (default https://api.nzbgeek.info/)
-NZBGEEK_URL=https://api.nzbgeek.info/
+# --- NZBgeek (Prowlarr indexer) ---
+NZBGEEKUSERNAME=
+NZBGEEKEMAIL=
+NZBGEEKAPI=https://api.nzbgeek.info/
+# API key (also accepted as NZBGEEK_API_KEY)
+NZBKEEPKEY=
 
-# --- Newshosting (Usenet provider — SABnzbd server) ---
-NEWSHOSTING_HOST=news.newshosting.com
-NEWSHOSTING_PORT=563
-NEWSHOSTING_SSL=1
-NEWSHOSTING_USER=
-NEWSHOSTING_PASS=
-# Connections: start ~20 (plan-dependent)
-NEWSHOSTING_CONNECTIONS=20
+# --- Newshosting (Usenet / SABnzbd) ---
+# NEWSHOSTINGAPI is the NNTP host hostname
+NEWSHOSTINGAPI=news.newshosting.com
+NEWSHOSTINGSSLPORT=563
+NEWSHOSTINGUSER=
+# also accepted: NEWSHOSTING_PASS, NEWSHOSTINGPASS
+HNEWSHOSTINGPASS=
+NEWSHOSTINGCONNECTIONS=20
 
-# --- Tweaknews (Usenet provider / fill-in block) ---
-TWEAKNEWS_HOST=news.tweaknews.eu
-TWEAKNEWS_PORT=563
-TWEAKNEWS_SSL=1
-TWEAKNEWS_USER=
-TWEAKNEWS_PASS=
-TWEAKNEWS_CONNECTIONS=10
+# --- Tweaknews (Usenet / SABnzbd) ---
+# TWEAKNEWSAPI is the NNTP host (e.g. news.tweaknews.eu or newshosting.tweaknews.eu)
+TWEAKNEWSAPI=news.tweaknews.eu
+TWEAKNEWSSSLPORT=563
+TWEAKNEWSLOGIN=
+TWEAKNEWSPASSWORD=
+TWEAKNEWSCONNECTIONS=40