remove SearXNG entirely; fix Kiwix cold-start
SearXNG: - Dropped from both setup scripts and docker-compose (Google/Startpage block self-hosted instances by IP — not reliable enough to include) - Removed all interactive safe-search and engine-selection prompts - Removed Open WebUI RAG web-search env vars (ENABLE_RAG_WEB_SEARCH, SEARXNG_QUERY_URL, etc.) - Removed port 8888 from UFW rules, start.sh URLs, done output, and the Caddyfile template - Removed searxng/ from .gitignore (directory no longer created) - configure-searxng-safesearch.sh kept in repo for optional manual use Kiwix: - Replace the blocking wait-loop (`until ls *.zim`) with a one-liner that passes whatever ZIM files exist (or none) directly to kiwix-serve, so the container starts immediately and shows an empty library page rather than hanging until ZIMs are downloaded https://claude.ai/code/session_012gDnantBmFTWZGCiKyjazx
This commit is contained in:
Claude
+5
-242
@@ -44,219 +44,6 @@ info "Base : $BASE"
|
||||
info "IP : $LOCAL_IP"
|
||||
info "GPU : ${VRAM_GB}GB VRAM → $TIER"
|
||||
|
||||
# ── SearXNG safe-search & engine selection ────────────────────────────────────
|
||||
SEARXNG_DISABLE_ENGINES=""
|
||||
SEARXNG_ENABLE_ENGINES=""
|
||||
echo ""
|
||||
echo " SearXNG safe-search level:"
|
||||
echo " 0) None — all results, no filtering (default)"
|
||||
echo " 1) Moderate — filter explicit content"
|
||||
echo " 2) Strict — block all explicit content"
|
||||
echo ""
|
||||
read -rp " Choice [0]: " _SAFE_PICK
|
||||
case "${_SAFE_PICK:-0}" in
|
||||
1) SEARXNG_SAFE_LEVEL="moderate"; SEARXNG_SAFE_INT=1 ;;
|
||||
2) SEARXNG_SAFE_LEVEL="strict"; SEARXNG_SAFE_INT=2 ;;
|
||||
*) SEARXNG_SAFE_LEVEL="none"; SEARXNG_SAFE_INT=0 ;;
|
||||
esac
|
||||
|
||||
# Default ON/OFF for an engine given the chosen safe-search level.
|
||||
# Engines without safe-search support default OFF for moderate/strict.
|
||||
_sxst() {
|
||||
[[ "$SEARXNG_SAFE_LEVEL" == "none" ]] && echo ON && return
|
||||
case "$1" in
|
||||
mojeek|"mojeek images"|"mojeek news"|\
|
||||
yandex|"yandex images"|\
|
||||
baidu|naver|\
|
||||
invidious|piped|peertube|sepiasearch|\
|
||||
vimeo|bitchute|rumble|odysee|\
|
||||
imgur|deviantart|artstation) echo OFF ;;
|
||||
*) echo ON ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Whiptail checklist — prints selected engine names (one per line).
|
||||
# ESC returns the engines that were pre-checked ON (keeps defaults unchanged).
|
||||
_sxmenu() {
|
||||
local _t="$1"; shift
|
||||
local -a _n=() _s=() _a=(); local _i=1
|
||||
while [[ $# -ge 3 ]]; do
|
||||
_n+=("$1"); _s+=("$3")
|
||||
_a+=("$_i" "$(printf '%-26s %s' "$1" "$2")" "$3")
|
||||
_i=$(( _i + 1 )); shift 3
|
||||
done
|
||||
local _h=$(( ${#_n[@]} + 9 > 24 ? 24 : ${#_n[@]} + 9 ))
|
||||
local _lh=$(( ${#_n[@]} < 14 ? ${#_n[@]} : 14 ))
|
||||
local _o _rc _j
|
||||
# Note: NO 2>/dev/null after the FD swap — that redirect would overwrite
|
||||
# the pipe (FD2 after swap) with /dev/null, silently discarding selections.
|
||||
_o=$(whiptail --backtitle "SearXNG — $SEARXNG_SAFE_LEVEL" \
|
||||
--title "$_t" --checklist \
|
||||
"SPACE = toggle ENTER = confirm ESC = use defaults" \
|
||||
"$_h" 76 "$_lh" "${_a[@]}" 3>&1 1>&2 2>&3) && _rc=0 || _rc=$?
|
||||
if [[ $_rc -ne 0 ]] || [[ -z "${_o//\"}" ]]; then
|
||||
# ESC / cancel / empty selection → use pre-checked defaults
|
||||
for _j in "${!_n[@]}"; do
|
||||
[[ "${_s[$_j]}" == "ON" ]] && printf '%s\n' "${_n[$_j]}"
|
||||
done
|
||||
return
|
||||
fi
|
||||
for _id in $_o; do _id="${_id//\"/}"; printf '%s\n' "${_n[$(( _id-1 ))]}"; done
|
||||
}
|
||||
|
||||
_SX_AUTOFF=(mojeek yandex "yandex images" baidu naver invidious piped peertube sepiasearch)
|
||||
|
||||
if command -v whiptail &>/dev/null && [[ -t 0 ]]; then
|
||||
# ── Web search ─────────────────────────────────────────────────────────────
|
||||
_SX_W=$(_sxmenu "Web Search Engines" \
|
||||
"google" "Google" ON \
|
||||
"bing" "Microsoft Bing" ON \
|
||||
"duckduckgo" "DuckDuckGo" ON \
|
||||
"brave" "Brave Search" ON \
|
||||
"startpage" "Startpage (Google proxy)" ON \
|
||||
"qwant" "Qwant" ON \
|
||||
"yahoo" "Yahoo" ON \
|
||||
"ecosia" "Ecosia" ON \
|
||||
"presearch" "Presearch" ON \
|
||||
"yep" "Yep" ON \
|
||||
"wiby" "Wiby (classic/indie web)" ON \
|
||||
"mojeek" "Mojeek [no safe-search]" "$(_sxst mojeek)" \
|
||||
"yandex" "Yandex [unreliable filter]" "$(_sxst yandex)" \
|
||||
"baidu" "Baidu [no safe-search]" "$(_sxst baidu)" \
|
||||
"naver" "Naver (Korean) [no safe-search]" "$(_sxst naver)")
|
||||
|
||||
# ── Images ─────────────────────────────────────────────────────────────────
|
||||
_SX_I=$(_sxmenu "Image Search Engines" \
|
||||
"google images" "Google Images" ON \
|
||||
"bing images" "Bing Images" ON \
|
||||
"duckduckgo images" "DuckDuckGo Images" ON \
|
||||
"brave images" "Brave Images" ON \
|
||||
"qwant images" "Qwant Images" ON \
|
||||
"startpage images" "Startpage Images" ON \
|
||||
"mojeek images" "Mojeek Images [no safe-search]" "$(_sxst 'mojeek images')" \
|
||||
"presearch images" "Presearch Images" ON \
|
||||
"openverse" "Openverse (open license)" ON \
|
||||
"unsplash" "Unsplash (stock photos)" ON \
|
||||
"pexels" "Pexels (stock photos)" ON \
|
||||
"pixabay images" "Pixabay Images" ON \
|
||||
"pinterest" "Pinterest" ON \
|
||||
"flickr" "Flickr" ON \
|
||||
"wikcommons.images" "Wikimedia Commons Images" ON \
|
||||
"artic" "Art Institute of Chicago" ON \
|
||||
"yandex images" "Yandex Images [no safe-search]" "$(_sxst 'yandex images')" \
|
||||
"imgur" "Imgur [adult content]" "$(_sxst imgur)" \
|
||||
"deviantart" "DeviantArt [adult content]" "$(_sxst deviantart)" \
|
||||
"artstation" "ArtStation [adult content]" "$(_sxst artstation)" \
|
||||
"adobe stock" "Adobe Stock" ON)
|
||||
|
||||
# ── Videos ─────────────────────────────────────────────────────────────────
|
||||
_SX_V=$(_sxmenu "Video Search Engines" \
|
||||
"youtube" "YouTube" ON \
|
||||
"bing videos" "Bing Videos" ON \
|
||||
"brave videos" "Brave Videos" ON \
|
||||
"duckduckgo videos" "DuckDuckGo Videos" ON \
|
||||
"google videos" "Google Videos" ON \
|
||||
"qwant videos" "Qwant Videos" ON \
|
||||
"dailymotion" "Dailymotion" ON \
|
||||
"media.ccc.de" "media.ccc.de (tech talks)" ON \
|
||||
"wikcommons.videos" "Wikimedia Commons Videos" ON \
|
||||
"vimeo" "Vimeo [no safe-search]" "$(_sxst vimeo)" \
|
||||
"odysee" "Odysee [no safe-search]" "$(_sxst odysee)" \
|
||||
"rumble" "Rumble [no safe-search]" "$(_sxst rumble)" \
|
||||
"bitchute" "BitChute [no safe-search]" "$(_sxst bitchute)" \
|
||||
"invidious" "Invidious (YT) [no safe-search]" "$(_sxst invidious)" \
|
||||
"piped" "Piped (YT) [no safe-search]" "$(_sxst piped)" \
|
||||
"peertube" "PeerTube [no safe-search]" "$(_sxst peertube)" \
|
||||
"sepiasearch" "SepiaSearch [no safe-search]" "$(_sxst sepiasearch)")
|
||||
|
||||
# ── News ───────────────────────────────────────────────────────────────────
|
||||
_SX_N=$(_sxmenu "News Search Engines" \
|
||||
"google news" "Google News" ON \
|
||||
"bing news" "Bing News" ON \
|
||||
"duckduckgo news" "DuckDuckGo News" ON \
|
||||
"brave news" "Brave News" ON \
|
||||
"qwant news" "Qwant News" ON \
|
||||
"startpage news" "Startpage News" ON \
|
||||
"presearch news" "Presearch News" ON \
|
||||
"mojeek news" "Mojeek News [no safe-search]" "$(_sxst 'mojeek news')" \
|
||||
"reuters" "Reuters" ON \
|
||||
"yahoo news" "Yahoo News" ON \
|
||||
"wikinews" "WikiNews" ON \
|
||||
"yep news" "Yep News" ON)
|
||||
|
||||
# ── Reference & Knowledge ──────────────────────────────────────────────────
|
||||
_SX_R=$(_sxmenu "Reference & Knowledge" \
|
||||
"wikipedia" "Wikipedia" ON \
|
||||
"wikidata" "Wikidata" ON \
|
||||
"wolframalpha" "Wolfram|Alpha" ON \
|
||||
"ask" "Ask.com" ON \
|
||||
"ddg definitions" "DuckDuckGo Definitions" ON \
|
||||
"encyclopsearch" "Encyclopsearch" ON \
|
||||
"wikibooks" "Wikibooks" ON \
|
||||
"wikiquote" "Wikiquote" ON \
|
||||
"wikisource" "Wikisource" ON \
|
||||
"wikispecies" "Wikispecies" ON \
|
||||
"wikiversity" "Wikiversity" ON \
|
||||
"wikivoyage" "Wikivoyage" ON)
|
||||
|
||||
# ── Science ────────────────────────────────────────────────────────────────
|
||||
_SX_S=$(_sxmenu "Science / Academic" \
|
||||
"arxiv" "arXiv (preprints)" ON \
|
||||
"semantic scholar" "Semantic Scholar" ON \
|
||||
"pubmed" "PubMed (medical)" ON \
|
||||
"crossref" "Crossref (DOI/papers)" ON \
|
||||
"base" "BASE (open access)" ON)
|
||||
|
||||
_SX_ALL=(
|
||||
# Web
|
||||
"google" "bing" "duckduckgo" "brave" "startpage" "qwant" "yahoo" "ecosia"
|
||||
"presearch" "yep" "wiby"
|
||||
"mojeek" "yandex" "baidu" "naver"
|
||||
# Images
|
||||
"google images" "bing images" "duckduckgo images" "brave images" "qwant images"
|
||||
"startpage images" "mojeek images" "presearch images"
|
||||
"openverse" "unsplash" "pexels" "pixabay images" "pinterest" "flickr"
|
||||
"wikcommons.images" "artic" "yandex images" "imgur" "deviantart" "artstation" "adobe stock"
|
||||
# Videos
|
||||
"youtube" "bing videos" "brave videos" "duckduckgo videos" "google videos" "qwant videos"
|
||||
"dailymotion" "media.ccc.de" "wikcommons.videos"
|
||||
"vimeo" "odysee" "rumble" "bitchute"
|
||||
"invidious" "piped" "peertube" "sepiasearch"
|
||||
# News
|
||||
"google news" "bing news" "duckduckgo news" "brave news" "qwant news"
|
||||
"startpage news" "presearch news" "mojeek news"
|
||||
"reuters" "yahoo news" "wikinews" "yep news"
|
||||
# Reference
|
||||
"wikipedia" "wikidata" "wolframalpha" "ask" "ddg definitions" "encyclopsearch"
|
||||
"wikibooks" "wikiquote" "wikisource" "wikispecies" "wikiversity" "wikivoyage"
|
||||
# Science
|
||||
"arxiv" "semantic scholar" "pubmed" "crossref" "base"
|
||||
)
|
||||
_SX_SEL=$(printf '%s\n' "$_SX_W" "$_SX_I" "$_SX_V" "$_SX_N" "$_SX_R" "$_SX_S")
|
||||
|
||||
for _e in "${_SX_ALL[@]}"; do
|
||||
if printf '%s\n' "$_SX_SEL" | grep -qxF "$_e"; then
|
||||
for _ao in "${_SX_AUTOFF[@]}"; do
|
||||
if [[ "$_e" == "$_ao" ]]; then
|
||||
SEARXNG_ENABLE_ENGINES+="${SEARXNG_ENABLE_ENGINES:+,}${_e}"
|
||||
break
|
||||
fi
|
||||
done
|
||||
else
|
||||
SEARXNG_DISABLE_ENGINES+="${SEARXNG_DISABLE_ENGINES:+,}${_e}"
|
||||
fi
|
||||
done
|
||||
else
|
||||
echo ""
|
||||
echo " (whiptail not available — text entry)"
|
||||
echo " Web: google bing duckduckgo brave startpage qwant yahoo presearch"
|
||||
echo " Imgs: google_images bing_images duckduckgo_images flickr imgur"
|
||||
echo " Vids: youtube dailymotion vimeo rumble odysee bitchute"
|
||||
echo " News: google_news bing_news reuters yahoo_news wikinews"
|
||||
read -rp " Engines to disable (space-separated, Enter for defaults): " _ENGS
|
||||
SEARXNG_DISABLE_ENGINES="${_ENGS// /,}"
|
||||
fi
|
||||
echo ""
|
||||
|
||||
write_if_new() {
|
||||
local dest="$1"; local body; body=$(cat)
|
||||
@@ -295,7 +82,7 @@ fi
|
||||
|
||||
# ── directories ───────────────────────────────────────────────────────────────
|
||||
section "Directories"
|
||||
for d in papers repos workspace index searxng invokeai-data invokeai-outputs kiwix gitea portainer-data logs; do
|
||||
for d in papers repos workspace index invokeai-data invokeai-outputs kiwix gitea portainer-data logs; do
|
||||
mkdir -p "$BASE/$d"
|
||||
done
|
||||
ok "Ready under $BASE"
|
||||
@@ -693,15 +480,6 @@ httpx
|
||||
REQ
|
||||
ok "requirements.txt + mcp_requirements.txt"
|
||||
|
||||
# =============================================================================
|
||||
section "SearXNG Config"
|
||||
# =============================================================================
|
||||
mkdir -p "$BASE/searxng"
|
||||
_SXARGS=("$SEARXNG_SAFE_LEVEL")
|
||||
[[ -n "$SEARXNG_DISABLE_ENGINES" ]] && _SXARGS+=(--disable-engines "$SEARXNG_DISABLE_ENGINES")
|
||||
[[ -n "$SEARXNG_ENABLE_ENGINES" ]] && _SXARGS+=(--enable-engines "$SEARXNG_ENABLE_ENGINES")
|
||||
BASE="$BASE" bash "$SCRIPT_DIR/configure-searxng-safesearch.sh" "${_SXARGS[@]}"
|
||||
|
||||
# =============================================================================
|
||||
section ".env (tokens — never overwritten)"
|
||||
# =============================================================================
|
||||
@@ -736,7 +514,7 @@ cat > "$BASE/docker-compose.yml" << COMPOSE
|
||||
# Show status: docker compose ps
|
||||
#
|
||||
# Services: ollama open-webui chromadb rag-server mcp-server
|
||||
# searxng kiwix gitea invokeai portainer
|
||||
# kiwix gitea invokeai portainer
|
||||
# ───────────────────────────────────────────────────────────────────────────────
|
||||
|
||||
services:
|
||||
@@ -774,11 +552,6 @@ services:
|
||||
- OPENAI_API_BASE_URL=http://rag-server:8001/v1
|
||||
- OPENAI_API_KEY=local-rag
|
||||
- ENABLE_OPENAI_API=true
|
||||
- ENABLE_RAG_WEB_SEARCH=true
|
||||
- RAG_WEB_SEARCH_ENGINE=searxng
|
||||
- SEARXNG_QUERY_URL=http://searxng:8080/search?q=<query>&format=json&safesearch=${SEARXNG_SAFE_INT}
|
||||
- RAG_WEB_SEARCH_RESULT_COUNT=5
|
||||
- RAG_WEB_SEARCH_CONCURRENT_REQUESTS=10
|
||||
- ENABLE_TOOL_SERVERS=true
|
||||
- WEBUI_AUTH=true
|
||||
depends_on:
|
||||
@@ -845,22 +618,14 @@ services:
|
||||
python mcp_server.py"
|
||||
depends_on: [rag-server]
|
||||
|
||||
searxng:
|
||||
image: searxng/searxng:latest
|
||||
container_name: searxng
|
||||
restart: unless-stopped
|
||||
ports: ["0.0.0.0:8888:8080"]
|
||||
volumes: [$BASE/searxng:/etc/searxng]
|
||||
cap_drop: [ALL]
|
||||
cap_add: [CHOWN, SETGID, SETUID]
|
||||
|
||||
kiwix:
|
||||
image: ghcr.io/kiwix/kiwix-serve:latest
|
||||
container_name: kiwix
|
||||
restart: unless-stopped
|
||||
ports: ["0.0.0.0:8181:8080"]
|
||||
volumes: [$BASE/kiwix:/data]
|
||||
command: "*.zim"
|
||||
entrypoint: ["sh", "-c"]
|
||||
command: ["exec kiwix-serve $(ls /data/*.zim 2>/dev/null | tr '\\n' ' ')"]
|
||||
|
||||
gitea:
|
||||
image: gitea/gitea:latest
|
||||
@@ -922,7 +687,7 @@ if command -v ufw &>/dev/null && [[ ! -f "$BASE/.ufw-done" ]] || $FORCE; then
|
||||
read -rp " LAN subnet [192.168.1.0/24]: " LAN; LAN="${LAN:-192.168.1.0/24}"
|
||||
[[ "$LAN" =~ /[0-9]+$ ]] || LAN="${LAN}/24"
|
||||
for pc in "3000:Open WebUI" "11434:Ollama" "8001:RAG" "8002:MCP" \
|
||||
"8000:ChromaDB" "8888:SearXNG" "8181:Kiwix" \
|
||||
"8000:ChromaDB" "8181:Kiwix" \
|
||||
"3001:Gitea" "2222:Gitea SSH" "9090:InvokeAI" \
|
||||
"9000:Portainer" "9443:Portainer S"; do
|
||||
sudo ufw allow from "$LAN" to any port "${pc%%:*}" proto tcp comment "${pc##*:}" >/dev/null
|
||||
@@ -941,7 +706,6 @@ docker compose up -d
|
||||
echo ""
|
||||
echo " Open WebUI → http://$LOCAL_IP:3000"
|
||||
echo " InvokeAI → http://$LOCAL_IP:9090"
|
||||
echo " SearXNG → http://$LOCAL_IP:8888"
|
||||
echo " Kiwix → http://$LOCAL_IP:8181 (run kiwix_download.sh first)"
|
||||
echo " Gitea → http://$LOCAL_IP:3001"
|
||||
echo " RAG → http://$LOCAL_IP:8001/health"
|
||||
@@ -1041,7 +805,6 @@ echo -e "${GREEN}${BOLD}━━━━━━━━━━━━━━━━━━
|
||||
echo ""
|
||||
echo -e " ${CYAN}Open WebUI${NC} → http://$LOCAL_IP:3000"
|
||||
echo -e " ${CYAN}InvokeAI${NC} → http://$LOCAL_IP:9090"
|
||||
echo -e " ${CYAN}SearXNG${NC} → http://$LOCAL_IP:8888"
|
||||
echo -e " ${CYAN}Kiwix${NC} → http://$LOCAL_IP:8181"
|
||||
echo -e " ${CYAN}Gitea${NC} → http://$LOCAL_IP:3001"
|
||||
echo -e " ${CYAN}RAG${NC} → http://$LOCAL_IP:8001/health"
|
||||
|
||||
Reference in New Issue
Block a user