fix init

2026-05-31 10:09:47 +02:00
parent ef851d82c3
commit f04eb7016f
8 changed files with 204 additions and 292 deletions
@@ -18,10 +18,6 @@ RTORRENT_USER="${RTORRENT_USER:-rtorrent}"
 RTORRENT_HOME="${RTORRENT_HOME:-/home/${RTORRENT_USER}}"
 RTORRENT_BASE_DIR="${RTORRENT_BASE_DIR:-/opt/rtorrent_build}"
 RTORRENT_SCGI_PORT="${RTORRENT_SCGI_PORT:-5000}"
-RTORRENT_SCGI_BACKEND="${RTORRENT_SCGI_BACKEND:-tcp}"
-RTORRENT_SCGI_SOCKET="${RTORRENT_SCGI_SOCKET:-/run/rtorrent/rtorrent.sock}"
-RTORRENT_SCGI_PROXY_LISTEN="${RTORRENT_SCGI_PROXY_LISTEN:-127.0.0.1:5050}"
-RTORRENT_SCGI_PROXY_TOKEN="${RTORRENT_SCGI_PROXY_TOKEN:-}"
 RTORRENT_TORRENT_PORT="${RTORRENT_TORRENT_PORT:-51300}"
 RTORRENT_REF="${RTORRENT_REF:-v0.16.11}"
 LIBTORRENT_REF="${LIBTORRENT_REF:-v0.16.11}"
@@ -31,57 +27,50 @@ PYTORRENT_BASE_URL="${PYTORRENT_BASE_URL:-http://127.0.0.1:${PYTORRENT_PORT}}"
 PYTORRENT_PROFILE_NAME="${PYTORRENT_PROFILE_NAME:-Local rTorrent}"
 PYTORRENT_API_TOKEN="${PYTORRENT_API_TOKEN:-}"
 PYTORRENT_SERVICE_NAME="${PYTORRENT_SERVICE_NAME:-pytorrent}"
-PYTORRENT_RTORRENT_SCGI_URL="${PYTORRENT_RTORRENT_SCGI_URL:-}"
-
-normalize_scgi_settings() {
-    case "${RTORRENT_SCGI_BACKEND}" in
-        tcp|unix) ;;
-        *) echo "Invalid RTORRENT_SCGI_BACKEND: ${RTORRENT_SCGI_BACKEND}" >&2; exit 1 ;;
-    esac
-    if [[ "${RTORRENT_SCGI_BACKEND}" == "unix" ]]; then
-        if [[ -z "${RTORRENT_SCGI_PROXY_TOKEN}" ]]; then
-            RTORRENT_SCGI_PROXY_TOKEN="$(LC_ALL=C tr -dc 'A-Za-z0-9_-' </dev/urandom | head -c 43 || true)"
-            if [[ -z "${RTORRENT_SCGI_PROXY_TOKEN}" ]]; then
-                RTORRENT_SCGI_PROXY_TOKEN="$(date +%s%N)"
-            fi
-        fi
-        PYTORRENT_RTORRENT_SCGI_URL="${PYTORRENT_RTORRENT_SCGI_URL:-scgi://${RTORRENT_SCGI_PROXY_LISTEN}/proxy/${RTORRENT_SCGI_PROXY_TOKEN}}"
-    else
-        PYTORRENT_RTORRENT_SCGI_URL="${PYTORRENT_RTORRENT_SCGI_URL:-scgi://127.0.0.1:${RTORRENT_SCGI_PORT}}"
-    fi
-}
+RTORRENT_SCGI_BACKEND="${RTORRENT_SCGI_BACKEND:-tcp}"
+RTORRENT_SCGI_SOCKET="${RTORRENT_SCGI_SOCKET:-/run/rtorrent/rtorrent.sock}"
+RTORRENT_SCGI_PROXY_LISTEN="${RTORRENT_SCGI_PROXY_LISTEN:-127.0.0.1:5050}"
+RTORRENT_SCGI_PROXY_TOKEN="${RTORRENT_SCGI_PROXY_TOKEN:-}"
+PYTORRENT_RTORRENT_SCGI_URL="${PYTORRENT_RTORRENT_SCGI_URL:-scgi://127.0.0.1:${RTORRENT_SCGI_PORT}}"

 RTORRENT_EXTRA_ARGS=()
 while [[ $# -gt 0 ]]; do
    case "$1" in
-        --scgi-backend)
-            RTORRENT_SCGI_BACKEND="$2"
-            shift 2
-            ;;
-        --scgi-unix-socket)
-            RTORRENT_SCGI_BACKEND="unix"
-            shift
-            ;;
-        --rtorrent-socket|--scgi-socket)
-            RTORRENT_SCGI_BACKEND="unix"
-            RTORRENT_SCGI_SOCKET="$2"
-            shift 2
-            ;;
        --with-xmlrpc-c)
            RTORRENT_EXTRA_ARGS+=(--with-xmlrpc-c)
            shift
            ;;
+        --scgi-unix-socket)
+            RTORRENT_SCGI_BACKEND=unix
+            shift
+            ;;
+        --rtorrent-socket)
+            RTORRENT_SCGI_BACKEND=unix
+            RTORRENT_SCGI_SOCKET="$2"
+            shift 2
+            ;;
        *)
            echo "Unknown option: $1" >&2
            exit 1
            ;;
    esac
 done
-normalize_scgi_settings
-
 if [[ "${RTORRENT_WITH_XMLRPC_C:-0}" == "1" ]]; then
    RTORRENT_EXTRA_ARGS+=(--with-xmlrpc-c)
 fi
+if [[ "${RTORRENT_SCGI_BACKEND}" == "unix" ]]; then
+    if [[ -z "${RTORRENT_SCGI_PROXY_TOKEN}" ]]; then
+        RTORRENT_SCGI_PROXY_TOKEN="$(${PYTHON_BIN:-python3} - <<'PYTOKEN'
+import secrets
+print(secrets.token_urlsafe(32))
+PYTOKEN
+)"
+    fi
+    PYTORRENT_RTORRENT_SCGI_URL="scgi://${RTORRENT_SCGI_PROXY_LISTEN}/proxy/${RTORRENT_SCGI_PROXY_TOKEN}"
+elif [[ "${RTORRENT_SCGI_BACKEND}" != "tcp" ]]; then
+    echo "Invalid RTORRENT_SCGI_BACKEND: ${RTORRENT_SCGI_BACKEND}" >&2
+    exit 1
+fi

 export PYTORRENT_APP_DIR PYTORRENT_PORT PYTORRENT_SERVICE_NAME PYTORRENT_API_TOKEN

@@ -138,6 +127,9 @@ RTORRENT_INSTALL_ARGS=(
 if [[ "${PYTORRENT_DEBUG_INSTALL:-0}" == "1" ]]; then
    RTORRENT_INSTALL_ARGS+=(--debug)
 fi
+if [[ "${RTORRENT_SCGI_BACKEND}" == "unix" ]]; then
+    RTORRENT_INSTALL_ARGS+=(--scgi-unix-socket "${RTORRENT_SCGI_SOCKET}")
+fi

 python3 "${SCRIPT_DIR}/install_rtorrent.py" \
    "${RTORRENT_INSTALL_ARGS[@]}" \
@@ -147,17 +139,30 @@ python3 "${SCRIPT_DIR}/install_rtorrent.py" \
    --group "${RTORRENT_USER}" \
    --home "${RTORRENT_HOME}" \
    --scgi-port "${RTORRENT_SCGI_PORT}" \
-    --scgi-backend "${RTORRENT_SCGI_BACKEND}" \
-    --scgi-socket "${RTORRENT_SCGI_SOCKET}" \
    --torrent-port "${RTORRENT_TORRENT_PORT}" \
    --rtorrent-ref "${RTORRENT_REF}" \
    --libtorrent-ref "${LIBTORRENT_REF}"

 cd "${PROJECT_DIR}"
-PYTORRENT_APP_DIR="${PYTORRENT_APP_DIR}" PYTORRENT_PORT="${PYTORRENT_PORT}" PYTORRENT_SERVICE_NAME="${PYTORRENT_SERVICE_NAME}" PYTORRENT_PROFILE_NAME="${PYTORRENT_PROFILE_NAME}" PYTORRENT_RTORRENT_SCGI_URL="${PYTORRENT_RTORRENT_SCGI_URL}" PYTORRENT_INSTALL_SCGI_PROXY="$([[ "${RTORRENT_SCGI_BACKEND}" == "unix" ]] && echo yes || echo no)" RTORRENT_USER="${RTORRENT_USER}" RTORRENT_SOCKET="$([[ "${RTORRENT_SCGI_BACKEND}" == "unix" ]] && echo "${RTORRENT_SCGI_SOCKET}" || echo "")" RTORRENT_SCGI_PROXY_TARGET_NETWORK="$([[ "${RTORRENT_SCGI_BACKEND}" == "unix" ]] && echo unix || echo tcp)" RTORRENT_SCGI_PROXY_TARGET_ADDRESS="$([[ "${RTORRENT_SCGI_BACKEND}" == "unix" ]] && echo "${RTORRENT_SCGI_SOCKET}" || echo "127.0.0.1:${RTORRENT_SCGI_PORT}")" RTORRENT_SCGI_PROXY_LISTEN="${RTORRENT_SCGI_PROXY_LISTEN}" RTORRENT_SCGI_PROXY_TOKEN="${RTORRENT_SCGI_PROXY_TOKEN}" RTORRENT_SCGI_PROXY_EXTRA_GROUPS="${RTORRENT_USER}" bash "${PROJECT_DIR}/scripts/install_pytorrent_only.sh"     --yes     --app-dir "${PYTORRENT_APP_DIR}"     --port "${PYTORRENT_PORT}"     --service-name "${PYTORRENT_SERVICE_NAME}"     --profile-name "${PYTORRENT_PROFILE_NAME}"     --scgi-url "${PYTORRENT_RTORRENT_SCGI_URL}"
-
-if [[ -n "${PYTORRENT_API_TOKEN}" ]]; then
-    "${PYTORRENT_APP_DIR}/venv/bin/python" "${PYTORRENT_APP_DIR}/scripts/stack_installers/configure_pytorrent_api.py"         --base-url "${PYTORRENT_BASE_URL}"         --profile-name "${PYTORRENT_PROFILE_NAME}"         --scgi-url "${PYTORRENT_RTORRENT_SCGI_URL}"         --api-token "${PYTORRENT_API_TOKEN}"
+PYTORRENT_ONLY_ARGS=(
+    --yes
+    --app-dir "${PYTORRENT_APP_DIR}"
+    --port "${PYTORRENT_PORT}"
+    --service-name "${PYTORRENT_SERVICE_NAME}"
+    --profile-name "${PYTORRENT_PROFILE_NAME}"
+    --scgi-url "${PYTORRENT_RTORRENT_SCGI_URL}"
+)
+if [[ "${RTORRENT_SCGI_BACKEND}" == "unix" ]]; then
+    PYTORRENT_ONLY_ARGS+=(
+        --install-scgi-proxy yes
+        --rtorrent-user "${RTORRENT_USER}"
+        --rtorrent-socket "${RTORRENT_SCGI_SOCKET}"
+        --proxy-target-network unix
+        --proxy-target-address "${RTORRENT_SCGI_SOCKET}"
+        --proxy-listen "${RTORRENT_SCGI_PROXY_LISTEN}"
+        --proxy-token "${RTORRENT_SCGI_PROXY_TOKEN}"
+    )
 fi
+bash "${PROJECT_DIR}/scripts/install_pytorrent_only.sh" "${PYTORRENT_ONLY_ARGS[@]}"

 echo "Done. pyTorrent: ${PYTORRENT_BASE_URL} | rTorrent SCGI: ${PYTORRENT_RTORRENT_SCGI_URL}"