tim/stack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Map Tweaknews secret variable aliases in configure-usenet

Browse source 
Accept TWEAKNEWSLOGIN, TWEAKNEWSPASSWORD, TWEAKNEWSAPI (as host),
TWEAKNEWSSSLPORT, and TWEAKNEWSCONNECTIONS from secrets/.env.
This commit is contained in:
tim 2026-07-22 12:48:07 -07:00
parent d55f3220d9
commit ceba76df85
2 changed files with 37 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

25
scripts/configure-usenet.sh
View file

@ -23,21 +23,26 @@ set -a
source "$SECRETS_FILE" source "$SECRETS_FILE"
set +a set +a
# Accept both clean names and the keys already in secrets/.env # Accept clean names AND the variable names used in secrets/.env
NZBGEEK_API_KEY="${NZBGEEK_API_KEY:-${NZBKEEPKEY:-}}" # NZBgeek
NZBGEEK_API_KEY="${NZBGEEK_API_KEY:-${NZBKEEPKEY:-${NZBGEEKKEY:-}}}"
NZBGEEK_URL="${NZBGEEK_URL:-${NZBGEEKAPI:-https://api.nzbgeek.info/}}" 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_HOST="${NEWSHOSTING_HOST:-${NEWSHOSTINGAPI:-news.newshosting.com}}"
NEWSHOSTING_PORT="${NEWSHOSTING_PORT:-${NEWSHOSTINGSSLPORT:-563}}" 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_USER="${NEWSHOSTING_USER:-${NEWSHOSTINGUSER:-}}"
NEWSHOSTING_PASS="${NEWSHOSTING_PASS:-${HNEWSHOSTINGPASS:-${NEWSHOSTINGPASS:-}}}" NEWSHOSTING_PASS="${NEWSHOSTING_PASS:-${HNEWSHOSTINGPASS:-${NEWSHOSTINGPASS:-${NEWSHOSTINGPASSWORD:-}}}}"
NEWSHOSTING_CONNECTIONS="${NEWSHOSTING_CONNECTIONS:-20}" NEWSHOSTING_CONNECTIONS="${NEWSHOSTING_CONNECTIONS:-${NEWSHOSTINGCONNECTIONS:-20}}"
TWEAKNEWS_HOST="${TWEAKNEWS_HOST:-news.tweaknews.eu}" # Tweaknews (secrets use TWEAKNEWSLOGIN / TWEAKNEWSPASSWORD / TWEAKNEWSAPI as host)
TWEAKNEWS_PORT="${TWEAKNEWS_PORT:-563}" TWEAKNEWS_HOST="${TWEAKNEWS_HOST:-${TWEAKNEWSAPI:-${TWEAKNEWSHOST:-news.tweaknews.eu}}}"
TWEAKNEWS_USER="${TWEAKNEWS_USER:-${TWEAKNEWSUSER:-}}" TWEAKNEWS_PORT="${TWEAKNEWS_PORT:-${TWEAKNEWSSSLPORT:-${TWEAKNEWSPORT:-563}}}"
TWEAKNEWS_PASS="${TWEAKNEWS_PASS:-${TWEAKNEWSPASS:-}}" TWEAKNEWS_USER="${TWEAKNEWS_USER:-${TWEAKNEWSLOGIN:-${TWEAKNEWSUSER:-${TWEAKNEWSUSERNAME:-}}}}"
TWEAKNEWS_CONNECTIONS="${TWEAKNEWS_CONNECTIONS:-10}" TWEAKNEWS_PASS="${TWEAKNEWS_PASS:-${TWEAKNEWSPASSWORD:-${TWEAKNEWSPASS:-}}}"
TWEAKNEWS_CONNECTIONS="${TWEAKNEWS_CONNECTIONS:-${TWEAKNEWSCONNECTIONS:-10}}"
find_api_key() { find_api_key() {
local f local f

45
secrets/.env.example
View file

@ -1,27 +1,26 @@
# Copy to secrets/.env and fill in. NEVER commit secrets/.env # 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 (Prowlarr indexer) ---
NZBGEEK_USERNAME= NZBGEEKUSERNAME=
NZBGEEK_EMAIL= NZBGEEKEMAIL=
# API key from nzbgeek.info account (not the base URL) NZBGEEKAPI=https://api.nzbgeek.info/
NZBGEEK_API_KEY= # API key (also accepted as NZBGEEK_API_KEY)
# Optional base URL (default https://api.nzbgeek.info/) NZBKEEPKEY=
NZBGEEK_URL=https://api.nzbgeek.info/
# --- Newshosting (Usenet provider — SABnzbd server) --- # --- Newshosting (Usenet / SABnzbd) ---
NEWSHOSTING_HOST=news.newshosting.com # NEWSHOSTINGAPI is the NNTP host hostname
NEWSHOSTING_PORT=563 NEWSHOSTINGAPI=news.newshosting.com
NEWSHOSTING_SSL=1 NEWSHOSTINGSSLPORT=563
NEWSHOSTING_USER= NEWSHOSTINGUSER=
NEWSHOSTING_PASS= # also accepted: NEWSHOSTING_PASS, NEWSHOSTINGPASS
# Connections: start ~20 (plan-dependent) HNEWSHOSTINGPASS=
NEWSHOSTING_CONNECTIONS=20 NEWSHOSTINGCONNECTIONS=20
# --- Tweaknews (Usenet provider / fill-in block) --- # --- Tweaknews (Usenet / SABnzbd) ---
TWEAKNEWS_HOST=news.tweaknews.eu # TWEAKNEWSAPI is the NNTP host (e.g. news.tweaknews.eu or newshosting.tweaknews.eu)
TWEAKNEWS_PORT=563 TWEAKNEWSAPI=news.tweaknews.eu
TWEAKNEWS_SSL=1 TWEAKNEWSSSLPORT=563
TWEAKNEWS_USER= TWEAKNEWSLOGIN=
TWEAKNEWS_PASS= TWEAKNEWSPASSWORD=
TWEAKNEWS_CONNECTIONS=10 TWEAKNEWSCONNECTIONS=40