fix init

scripts/INSTALL.md

@@ -282,20 +282,3 @@ Notes:
 - Offline frontend libraries are the default. Use `--libs online` only when CDN loading is preferred.
 - Local auth is configured directly by the installer. External auth providers require a trusted reverse proxy setup; see `auth.md`.
 - Reverse proxy mode enables `PYTORRENT_PROXY_FIX_ENABLE`, secure cookies and CORS/API origins for the HTTPS domains plus localhost/local IP origins.
-
-### rTorrent SCGI over Unix socket
-
-Stack installers use TCP SCGI by default (`scgi://127.0.0.1:5000`). To configure rTorrent with a Unix socket and expose it to pyTorrent through `rtorrent-scgi-proxy`, run one of:
-
-```bash
-sudo bash scripts/install_stack.sh --scgi-unix-socket
-sudo bash scripts/install_stack.sh --rtorrent-socket /run/rtorrent/rtorrent.sock
-```
-
-Equivalent environment variables:
-
-```bash
-RTORRENT_SCGI_BACKEND=unix RTORRENT_SCGI_SOCKET=/run/rtorrent/rtorrent.sock sudo bash scripts/install_stack.sh
-```
-
-When socket mode is selected, the installer adds the proxy user to the rTorrent group and grants the proxy systemd unit supplementary group access so it can open the socket.

scripts/install_pytorrent_only.sh

@@ -25,6 +25,7 @@ PROXY_DOMAINS="${PYTORRENT_PROXY_DOMAINS:-}"
 CORS_ORIGINS="${PYTORRENT_SOCKETIO_CORS_ALLOWED_ORIGINS:-}"
 LOCAL_ORIGINS="${PYTORRENT_LOCAL_ORIGINS:-}"
 RTORRENT_SOCKET="${RTORRENT_SOCKET:-}"
+RTORRENT_USER="${RTORRENT_USER:-rtorrent}"
 INSTALL_SCGI_PROXY="${PYTORRENT_INSTALL_SCGI_PROXY:-ask}"
 RT_PROXY_USER="${RTORRENT_SCGI_PROXY_USER:-rtproxy}"
 RT_PROXY_LISTEN="${RTORRENT_SCGI_PROXY_LISTEN:-127.0.0.1:5050}"
@@ -33,7 +34,6 @@ RT_PROXY_ALLOW_NET="${RTORRENT_SCGI_PROXY_ALLOW_NET:-127.0.0.1}"
 RT_PROXY_TARGET_NETWORK_EXPLICIT="${RTORRENT_SCGI_PROXY_TARGET_NETWORK+x}"
 RT_PROXY_TARGET_NETWORK="${RTORRENT_SCGI_PROXY_TARGET_NETWORK:-tcp}"
 RT_PROXY_TARGET_ADDRESS="${RTORRENT_SCGI_PROXY_TARGET_ADDRESS:-127.0.0.1:5000}"
-RT_PROXY_EXTRA_GROUPS="${RTORRENT_SCGI_PROXY_EXTRA_GROUPS:-}"
 RT_PROXY_BINARY_URL="${RTORRENT_SCGI_PROXY_BINARY_URL:-https://git.linuxiarz.pl/gru/rtorrent-scgi-proxy/raw/branch/master/dist/rtorrent-scgi-proxy-linux-amd64}"
 RT_PROXY_TARGET_URI="${RTORRENT_SCGI_PROXY_TARGET_URI:-/RPC2}"
 ASSUME_YES=0
@@ -58,6 +58,7 @@ Options:
   --profile-name NAME           pyTorrent profile name. Default: Local rTorrent.
   --scgi-url URL                rTorrent SCGI URL. Default: scgi://127.0.0.1:5000.
   --rtorrent-socket PATH        rTorrent Unix socket; can enable SCGI proxy setup.
+  --rtorrent-user USER          rTorrent system user/group for Unix socket access. Default: rtorrent.
   --auth enable|disable         Enable pyTorrent authentication.
   --auth-provider local|proxy|tinyauth
   --auth-user USER              Local auth user to create/update. Default: pytorrent.
@@ -76,7 +77,6 @@ Options:
   --proxy-allow-net VALUE       SCGI proxy ALLOW_NET. Default: 127.0.0.1.
   --proxy-target-network tcp|unix
   --proxy-target-address VALUE
-  --proxy-extra-groups CSV      Extra system groups for rtorrent-scgi-proxy, useful for Unix socket access.
   --skip-profile                Do not create/update pyTorrent rTorrent profile.
   -h, --help                    Show this help.
 
@@ -144,6 +144,7 @@ parse_args() {
             --profile-name) PROFILE_NAME="$2"; shift 2 ;;
             --scgi-url) SCGI_URL="$2"; shift 2 ;;
             --rtorrent-socket) RTORRENT_SOCKET="$2"; shift 2 ;;
+            --rtorrent-user) RTORRENT_USER="$2"; shift 2 ;;
             --auth) AUTH_MODE="$(bool_value "$2")"; shift 2 ;;
             --auth-provider) AUTH_PROVIDER="$2"; shift 2 ;;
             --auth-user) AUTH_USER="$2"; shift 2 ;;
@@ -162,7 +163,6 @@ parse_args() {
             --proxy-allow-net) RT_PROXY_ALLOW_NET="$2"; shift 2 ;;
             --proxy-target-network) RT_PROXY_TARGET_NETWORK="$2"; RT_PROXY_TARGET_NETWORK_EXPLICIT=1; shift 2 ;;
             --proxy-target-address) RT_PROXY_TARGET_ADDRESS="$2"; shift 2 ;;
-            --proxy-extra-groups) RT_PROXY_EXTRA_GROUPS="$2"; shift 2 ;;
             --skip-profile) SKIP_PROFILE=1; shift ;;
             -h|--help) usage; exit 0 ;;
             *) fail "Unknown option: $1" ;;
@@ -215,9 +215,7 @@ ask_configuration() {
     prompt PROFILE_NAME "pyTorrent profile name" "Local rTorrent"
 
     if [[ -n "${RTORRENT_SOCKET}" ]]; then
-        INSTALL_SCGI_PROXY="yes"
+        INSTALL_SCGI_PROXY="${INSTALL_SCGI_PROXY:-ask}"
-        RT_PROXY_TARGET_NETWORK="unix"
-        RT_PROXY_TARGET_ADDRESS="${RTORRENT_SOCKET}"
     fi
     if [[ "${INSTALL_SCGI_PROXY}" == "ask" ]]; then
         prompt INSTALL_SCGI_PROXY "Install rtorrent-scgi-proxy for Unix socket backend? yes/no" "no"
@@ -537,42 +535,18 @@ SERVICE
 }
 
 
-grant_scgi_proxy_socket_access() {
+ensure_scgi_proxy_socket_access() {
-    [[ "${INSTALL_SCGI_PROXY}" == "yes" ]] || return 0
     [[ "${RT_PROXY_TARGET_NETWORK}" == "unix" ]] || return 0
-    local socket_path="${RT_PROXY_TARGET_ADDRESS}"
+    if getent group "${RTORRENT_USER}" >/dev/null 2>&1; then
-    [[ -n "${socket_path}" ]] || return 0
+        usermod -a -G "${RTORRENT_USER}" "${RT_PROXY_USER}" || true
-
-    local groups="${RT_PROXY_EXTRA_GROUPS}"
-    if [[ -S "${socket_path}" ]]; then
-        local socket_group
-        socket_group="$(stat -c '%G' "${socket_path}" 2>/dev/null || true)"
-        if [[ -n "${socket_group}" && "${socket_group}" != "UNKNOWN" ]]; then
-            groups="${groups:+${groups},}${socket_group}"
-            chmod g+rw "${socket_path}" 2>/dev/null || true
     fi
+    if [[ -n "${RT_PROXY_TARGET_ADDRESS}" ]]; then
+        local socket_dir
+        socket_dir="$(dirname "${RT_PROXY_TARGET_ADDRESS}")"
+        if [[ -d "${socket_dir}" && "${socket_dir}" == /run/* ]]; then
+            chgrp "${RTORRENT_USER}" "${socket_dir}" 2>/dev/null || true
+            chmod g+rx "${socket_dir}" 2>/dev/null || true
         fi
-    if [[ -n "${RTORRENT_USER:-}" ]] && getent group "${RTORRENT_USER}" >/dev/null 2>&1; then
-        groups="${groups:+${groups},}${RTORRENT_USER}"
-    fi
-    if [[ -z "${groups}" ]] && getent group rtorrent >/dev/null 2>&1; then
-        groups="rtorrent"
-    fi
-
-    if [[ -n "${groups}" ]]; then
-        local normalized="" group
-        IFS=',' read -r -a _groups <<< "${groups}"
-        for group in "${_groups[@]}"; do
-            group="$(printf '%s' "${group}" | xargs)"
-            [[ -n "${group}" ]] || continue
-            getent group "${group}" >/dev/null 2>&1 || continue
-            usermod -aG "${group}" "${RT_PROXY_USER}" || true
-            case ",${normalized}," in
-                *,${group},*) ;;
-                *) normalized="${normalized:+${normalized},}${group}" ;;
-            esac
-        done
-        RT_PROXY_EXTRA_GROUPS="${normalized}"
     fi
 }
 
@@ -585,7 +559,7 @@ install_scgi_proxy() {
         [[ -x "${shell_path}" ]] || shell_path="/usr/bin/nologin"
         useradd --system --no-create-home --shell "${shell_path}" "${RT_PROXY_USER}"
     fi
-    grant_scgi_proxy_socket_access
+    ensure_scgi_proxy_socket_access
     curl -fL "${RT_PROXY_BINARY_URL}" -o /usr/local/bin/rtorrent-scgi-proxy
     chmod 0755 /usr/local/bin/rtorrent-scgi-proxy
     cat > /etc/rtorrent-scgi-proxy.env <<ENV
@@ -603,6 +577,14 @@ MAX_CONTENT_BYTES=10485760
 ENV
     chmod 0600 /etc/rtorrent-scgi-proxy.env
     chown root:root /etc/rtorrent-scgi-proxy.env
+    local supplementary_groups=""
+    if [[ "${RT_PROXY_TARGET_NETWORK}" == "unix" ]] && getent group "${RTORRENT_USER}" >/dev/null 2>&1; then
+        supplementary_groups="SupplementaryGroups=${RTORRENT_USER}"
+    fi
+    local protect_home="yes"
+    if [[ "${RT_PROXY_TARGET_NETWORK}" == "unix" && "${RT_PROXY_TARGET_ADDRESS}" == /home/* ]]; then
+        protect_home="read-only"
+    fi
     cat > /etc/systemd/system/rtorrent-scgi-proxy.service <<SERVICE
 [Unit]
 Description=rTorrent SCGI proxy
@@ -613,7 +595,8 @@ Wants=network-online.target
 Type=simple
 User=${RT_PROXY_USER}
 Group=${RT_PROXY_USER}
-$(if [[ -n "${RT_PROXY_EXTRA_GROUPS}" ]]; then printf 'SupplementaryGroups=%s\n' "${RT_PROXY_EXTRA_GROUPS//,/ }"; fi)EnvironmentFile=/etc/rtorrent-scgi-proxy.env
+${supplementary_groups}
+EnvironmentFile=/etc/rtorrent-scgi-proxy.env
 ExecStart=/usr/local/bin/rtorrent-scgi-proxy
 Restart=on-failure
 RestartSec=2
@@ -621,7 +604,7 @@ RestartSec=2
 NoNewPrivileges=yes
 PrivateTmp=yes
 ProtectSystem=strict
-ProtectHome=read-only
+ProtectHome=${protect_home}
 ProtectKernelTunables=yes
 ProtectKernelModules=yes
 ProtectControlGroups=yes

scripts/stack_installers/INSTALL.md

@@ -220,20 +220,3 @@ PYTORRENT_DEBUG_INSTALL=1
 ```
 
 On RHEL-compatible systems the installer also tries to enable CRB/PowerTools and installs `libcurl-devel`, `redhat-rpm-config`, `patch`, `diffutils`, `findutils`, `file`, and `libstdc++-devel`, because minimal Alma/Rocky images often do not include enough build tooling.
-
-### SCGI TCP vs Unix socket
-
-Default stack mode remains TCP:
-
-```bash
-network.scgi.open_port = 127.0.0.1:5000
-```
-
-Socket mode is opt-in:
-
-```bash
-sudo bash scripts/install_stack.sh --scgi-unix-socket
-sudo bash scripts/install_stack.sh --rtorrent-socket /run/rtorrent/rtorrent.sock
-```
-
-Socket mode writes `network.scgi.open_local`, installs `rtorrent-scgi-proxy`, points pyTorrent at the proxy URL and grants the proxy user access to the rTorrent socket group.

scripts/stack_installers/install_rtorrent.py

@@ -543,10 +543,7 @@ def install_symlinks(rtorrent_install, libtorrent_install, xmlrpc_install=None,
     run(["ldconfig"], debug=debug)
 
 
-def write_service(service_path, binary_path, runtime_lib_dirs, *, runtime_directory=None):
+def write_service(service_path, binary_path, runtime_lib_dirs):
-    runtime_directory_lines = ""
-    if runtime_directory:
-        runtime_directory_lines = f"RuntimeDirectory={runtime_directory}\nRuntimeDirectoryMode=0750\n"
     service_content = f"""[Unit]
 Description=rTorrent for %I | https://git.linuxiarz.pl/gru/tools_scripts/_edit/master/install_rtorrent.py
 After=network.target
@@ -556,6 +553,8 @@ Type=simple
 User=%I
 Group=%I
 KillMode=process
+RuntimeDirectory=%I
+RuntimeDirectoryMode=0750
 WorkingDirectory=/home/%I
 ExecStartPre=-/bin/rm -f /home/%I/.session/rtorrent.lock
 ExecStart={binary_path} -o system.daemon.set=true -n -o import=/home/%I/.rtorrent.rc
@@ -564,7 +563,7 @@ TimeoutStopSec=300
 Restart=always
 RestartSec=3
 LimitNOFILE=1048576
-{runtime_directory_lines}Environment=LD_LIBRARY_PATH={runtime_lib_dirs}
+Environment=LD_LIBRARY_PATH={runtime_lib_dirs}
 
 [Install]
 WantedBy=multi-user.target
@@ -589,11 +588,8 @@ def rtorrent_bind_address_directive(rtorrent_ref, rtorrent_version=None):
         return "network.bind_address.set"
     return "network.bind_address.ipv4.set"
 
-def build_rtorrent_config_content(username, scgi_port, torrent_port, bind_address_directive, scgi_backend="tcp", scgi_socket="/run/rtorrent/rtorrent.sock"):
+def build_rtorrent_config_content(username, scgi_port, torrent_port, bind_address_directive, scgi_unix_socket=None):
-    if scgi_backend == "unix":
+    scgi_line = f"network.scgi.open_local = {scgi_unix_socket}" if scgi_unix_socket else f"{scgi_line}"
-        scgi_line = f"network.scgi.open_local = {scgi_socket}\nexecute.nothrow = chmod,660,{scgi_socket}"
-    else:
-        scgi_line = f"network.scgi.open_port = 127.0.0.1:{scgi_port}"
     return f"""
 ## https://git.linuxiarz.pl/gru/tools_scripts/_edit/master/install_rtorrent.py
 # Generated by install_rtorrent.py
@@ -646,9 +642,9 @@ pieces.hash.on_completion.set = 0
 #pieces.memory.max.set = 1024M
 """.lstrip()
 
-def write_rtorrent_config(user_home, username, scgi_port, torrent_port, bind_address_directive, *, scgi_backend="tcp", scgi_socket="/run/rtorrent/rtorrent.sock", force_config=False):
+def write_rtorrent_config(user_home, username, scgi_port, torrent_port, bind_address_directive, *, force_config=False, scgi_unix_socket=None):
     config_path = Path(user_home) / ".rtorrent.rc"
-    config_content = build_rtorrent_config_content(username, scgi_port, torrent_port, bind_address_directive, scgi_backend=scgi_backend, scgi_socket=scgi_socket)
+    config_content = build_rtorrent_config_content(username, scgi_port, torrent_port, bind_address_directive, scgi_unix_socket)
 
     if config_path.exists() and not force_config:
         print(f"Config already exists: {config_path}")
@@ -822,9 +818,8 @@ def build_parser():
     parser.add_argument("--user", default=DEFAULT_USER, help=f"System user for the service (default: {DEFAULT_USER})")
     parser.add_argument("--group", default=DEFAULT_GROUP, help=f"System group for the service (default: {DEFAULT_GROUP})")
     parser.add_argument("--home", default=DEFAULT_HOME, help=f"Home directory for the service user (default: {DEFAULT_HOME})")
-    parser.add_argument("--scgi-port", type=int, default=DEFAULT_SCGI_PORT, help=f"SCGI TCP listen port for rTorrent XMLRPC/SCGI (default: {DEFAULT_SCGI_PORT})")
+    parser.add_argument("--scgi-port", type=int, default=DEFAULT_SCGI_PORT, help=f"SCGI listen port for rTorrent XMLRPC/SCGI (default: {DEFAULT_SCGI_PORT})")
-    parser.add_argument("--scgi-backend", choices=["tcp", "unix"], default=os.getenv("RTORRENT_SCGI_BACKEND", "tcp"), help="rTorrent SCGI backend to write in .rtorrent.rc (default: tcp).")
+    parser.add_argument("--scgi-unix-socket", default="", help="Use Unix socket SCGI listener instead of TCP, for example /run/rtorrent/rtorrent.sock")
-    parser.add_argument("--scgi-socket", default=os.getenv("RTORRENT_SCGI_SOCKET", "/run/rtorrent/rtorrent.sock"), help="Unix socket path used when --scgi-backend unix is selected.")
     parser.add_argument("--torrent-port", type=int, default=DEFAULT_TORRENT_PORT, help=f"Incoming BitTorrent listen port (default: {DEFAULT_TORRENT_PORT})")
     parser.add_argument("--force-config", action="store_true", help="Overwrite existing ~/.rtorrent.rc. By default, existing config is left unchanged and the proposed changes are printed.")
     parser.add_argument("--only-build", action="store_true", help="Only build and install libtorrent/rTorrent under /opt. Skip user, config and systemd.")
@@ -886,10 +881,7 @@ def main():
         print("  - skip service user, config and systemd setup")
     else:
         print(f"  - configure systemd service for user '{args.user}'")
-        if args.scgi_backend == "unix":
+        print(f"  - use SCGI socket {args.scgi_unix_socket} and torrent port {args.torrent_port}" if args.scgi_unix_socket else f"  - use SCGI port {args.scgi_port} and torrent port {args.torrent_port}")
-            print(f"  - use SCGI Unix socket {args.scgi_socket} and torrent port {args.torrent_port}")
-        else:
-            print(f"  - use SCGI port {args.scgi_port} and torrent port {args.torrent_port}")
 
     if not prompt_yes_no("Continue?", default=True, assume_yes=args.yes):
         print("Aborted by user.")
@@ -928,7 +920,7 @@ def main():
         prepare_user_dirs(args.home, args.user)
         bind_address_directive = rtorrent_bind_address_directive(args.rtorrent_ref, rtorrent_version)
         print(f"Using rTorrent bind address directive: {bind_address_directive}")
-        write_rtorrent_config(args.home, args.user, args.scgi_port, args.torrent_port, bind_address_directive, scgi_backend=args.scgi_backend, scgi_socket=args.scgi_socket, force_config=args.force_config)
+        write_rtorrent_config(args.home, args.user, args.scgi_port, args.torrent_port, bind_address_directive, force_config=args.force_config, scgi_unix_socket=args.scgi_unix_socket or None)
         runtime_lib_dirs = [f"{libtorrent_install}/lib"]
         if args.rpc_backend == "xmlrpc-c" and xmlrpc_install:
             runtime_lib_dirs.append(f"{xmlrpc_install}/lib")
@@ -936,12 +928,7 @@ def main():
             runtime_lib_dirs.append(f"{curl_install}/lib")
         if cares_install:
             runtime_lib_dirs.append(f"{cares_install}/lib")
-        runtime_directory = None
+        write_service(DEFAULT_SERVICE_PATH, "/usr/local/bin/rtorrent", ":".join(runtime_lib_dirs))
-        if args.scgi_backend == "unix" and args.scgi_socket.startswith("/run/"):
-            parts = Path(args.scgi_socket).parts
-            if len(parts) >= 3:
-                runtime_directory = parts[2]
-        write_service(DEFAULT_SERVICE_PATH, "/usr/local/bin/rtorrent", ":".join(runtime_lib_dirs), runtime_directory=runtime_directory)
         enable_service(args.user, debug=args.debug)
         print(f"\nService status hint: systemctl status rtorrent@{args.user}.service")
 

scripts/stack_installers/install_rtorrent_rhel.py

@@ -536,10 +536,7 @@ def install_symlinks(rtorrent_install, libtorrent_install, xmlrpc_install=None,
     run(["ldconfig"], debug=debug)
 
 
-def write_service(service_path, binary_path, runtime_lib_dirs, *, runtime_directory=None):
+def write_service(service_path, binary_path, runtime_lib_dirs):
-    runtime_directory_lines = ""
-    if runtime_directory:
-        runtime_directory_lines = f"RuntimeDirectory={runtime_directory}\nRuntimeDirectoryMode=0750\n"
     service_content = f"""[Unit]
 Description=rTorrent for %I | https://git.linuxiarz.pl/gru/tools_scripts/_edit/master/install_rtorrent.py
 After=network.target
@@ -549,6 +546,8 @@ Type=simple
 User=%I
 Group=%I
 KillMode=process
+RuntimeDirectory=%I
+RuntimeDirectoryMode=0750
 WorkingDirectory=/home/%I
 ExecStartPre=-/bin/rm -f /home/%I/.session/rtorrent.lock
 ExecStart={binary_path} -o system.daemon.set=true -n -o import=/home/%I/.rtorrent.rc
@@ -557,7 +556,7 @@ TimeoutStopSec=300
 Restart=always
 RestartSec=3
 LimitNOFILE=1048576
-{runtime_directory_lines}Environment=LD_LIBRARY_PATH={runtime_lib_dirs}
+Environment=LD_LIBRARY_PATH={runtime_lib_dirs}
 
 [Install]
 WantedBy=multi-user.target
@@ -582,11 +581,8 @@ def rtorrent_bind_address_directive(rtorrent_ref, rtorrent_version=None):
         return "network.bind_address.set"
     return "network.bind_address.ipv4.set"
 
-def build_rtorrent_config_content(username, scgi_port, torrent_port, bind_address_directive, scgi_backend="tcp", scgi_socket="/run/rtorrent/rtorrent.sock"):
+def build_rtorrent_config_content(username, scgi_port, torrent_port, bind_address_directive, scgi_unix_socket=None):
-    if scgi_backend == "unix":
+    scgi_line = f"network.scgi.open_local = {scgi_unix_socket}" if scgi_unix_socket else f"{scgi_line}"
-        scgi_line = f"network.scgi.open_local = {scgi_socket}\nexecute.nothrow = chmod,660,{scgi_socket}"
-    else:
-        scgi_line = f"network.scgi.open_port = 127.0.0.1:{scgi_port}"
     return f"""
 ## https://git.linuxiarz.pl/gru/tools_scripts/_edit/master/install_rtorrent.py
 # Generated by install_rtorrent.py
@@ -640,9 +636,9 @@ pieces.hash.on_completion.set = 0
 """.lstrip()
 
 
-def write_rtorrent_config(user_home, username, scgi_port, torrent_port, bind_address_directive, *, scgi_backend="tcp", scgi_socket="/run/rtorrent/rtorrent.sock", force_config=False):
+def write_rtorrent_config(user_home, username, scgi_port, torrent_port, bind_address_directive, *, force_config=False, scgi_unix_socket=None):
     config_path = Path(user_home) / ".rtorrent.rc"
-    config_content = build_rtorrent_config_content(username, scgi_port, torrent_port, bind_address_directive, scgi_backend=scgi_backend, scgi_socket=scgi_socket)
+    config_content = build_rtorrent_config_content(username, scgi_port, torrent_port, bind_address_directive, scgi_unix_socket)
 
     if config_path.exists() and not force_config:
         print(f"Config already exists: {config_path}")
@@ -816,9 +812,8 @@ def build_parser():
     parser.add_argument("--user", default=DEFAULT_USER, help=f"System user for the service (default: {DEFAULT_USER})")
     parser.add_argument("--group", default=DEFAULT_GROUP, help=f"System group for the service (default: {DEFAULT_GROUP})")
     parser.add_argument("--home", default=DEFAULT_HOME, help=f"Home directory for the service user (default: {DEFAULT_HOME})")
-    parser.add_argument("--scgi-port", type=int, default=DEFAULT_SCGI_PORT, help=f"SCGI TCP listen port for rTorrent XMLRPC/SCGI (default: {DEFAULT_SCGI_PORT})")
+    parser.add_argument("--scgi-port", type=int, default=DEFAULT_SCGI_PORT, help=f"SCGI listen port for rTorrent XMLRPC/SCGI (default: {DEFAULT_SCGI_PORT})")
-    parser.add_argument("--scgi-backend", choices=["tcp", "unix"], default=os.getenv("RTORRENT_SCGI_BACKEND", "tcp"), help="rTorrent SCGI backend to write in .rtorrent.rc (default: tcp).")
+    parser.add_argument("--scgi-unix-socket", default="", help="Use Unix socket SCGI listener instead of TCP, for example /run/rtorrent/rtorrent.sock")
-    parser.add_argument("--scgi-socket", default=os.getenv("RTORRENT_SCGI_SOCKET", "/run/rtorrent/rtorrent.sock"), help="Unix socket path used when --scgi-backend unix is selected.")
     parser.add_argument("--torrent-port", type=int, default=DEFAULT_TORRENT_PORT, help=f"Incoming BitTorrent listen port (default: {DEFAULT_TORRENT_PORT})")
     parser.add_argument("--force-config", action="store_true", help="Overwrite existing ~/.rtorrent.rc. By default, existing config is left unchanged and the proposed changes are printed.")
     parser.add_argument("--only-build", action="store_true", help="Only build and install libtorrent/rTorrent under /opt. Skip user, config and systemd.")
@@ -870,10 +865,7 @@ def main():
         print("  - skip service user, config and systemd setup")
     else:
         print(f"  - configure systemd service for user '{args.user}'")
-        if args.scgi_backend == "unix":
+        print(f"  - use SCGI socket {args.scgi_unix_socket} and torrent port {args.torrent_port}" if args.scgi_unix_socket else f"  - use SCGI port {args.scgi_port} and torrent port {args.torrent_port}")
-            print(f"  - use SCGI Unix socket {args.scgi_socket} and torrent port {args.torrent_port}")
-        else:
-            print(f"  - use SCGI port {args.scgi_port} and torrent port {args.torrent_port}")
 
     if not prompt_yes_no("Continue?", default=True, assume_yes=args.yes):
         print("Aborted by user.")
@@ -912,7 +904,7 @@ def main():
         prepare_user_dirs(args.home, args.user)
         bind_address_directive = rtorrent_bind_address_directive(args.rtorrent_ref, rtorrent_version)
         print(f"Using rTorrent bind address directive: {bind_address_directive}")
-        write_rtorrent_config(args.home, args.user, args.scgi_port, args.torrent_port, bind_address_directive, scgi_backend=args.scgi_backend, scgi_socket=args.scgi_socket, force_config=args.force_config)
+        write_rtorrent_config(args.home, args.user, args.scgi_port, args.torrent_port, bind_address_directive, force_config=args.force_config, scgi_unix_socket=args.scgi_unix_socket or None)
         runtime_lib_dirs = [f"{libtorrent_install}/lib"]
         if args.rpc_backend == "xmlrpc-c" and xmlrpc_install:
             runtime_lib_dirs.append(f"{xmlrpc_install}/lib")
@@ -920,12 +912,7 @@ def main():
             runtime_lib_dirs.append(f"{curl_install}/lib")
         if cares_install:
             runtime_lib_dirs.append(f"{cares_install}/lib")
-        runtime_directory = None
+        write_service(DEFAULT_SERVICE_PATH, "/usr/local/bin/rtorrent", ":".join(runtime_lib_dirs))
-        if args.scgi_backend == "unix" and args.scgi_socket.startswith("/run/"):
-            parts = Path(args.scgi_socket).parts
-            if len(parts) >= 3:
-                runtime_directory = parts[2]
-        write_service(DEFAULT_SERVICE_PATH, "/usr/local/bin/rtorrent", ":".join(runtime_lib_dirs), runtime_directory=runtime_directory)
         enable_service(args.user, debug=args.debug)
         print(f"\nService status hint: systemctl status rtorrent@{args.user}.service")
 

scripts/stack_installers/install_stack_arch.sh

@@ -16,10 +16,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}"
@@ -29,28 +25,14 @@ 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:-}"
+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_BUILD_FROM_SOURCE="${RTORRENT_BUILD_FROM_SOURCE:-0}"
 RTORRENT_FORCE_CONFIG="${RTORRENT_FORCE_CONFIG:-1}"
 
-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_EXTRA_ARGS=()
 while [[ $# -gt 0 ]]; do
     case "$1" in
@@ -58,38 +40,46 @@ while [[ $# -gt 0 ]]; do
             RTORRENT_BUILD_FROM_SOURCE=1
             shift
             ;;
-        --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_BUILD_FROM_SOURCE=1
             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
-            echo "Supported options: --build-rtorrent, --with-xmlrpc-c, --scgi-backend tcp|unix, --scgi-unix-socket, --rtorrent-socket PATH" >&2
+            echo "Supported options: --build-rtorrent, --with-xmlrpc-c, --scgi-unix-socket, --rtorrent-socket PATH" >&2
             exit 1
             ;;
     esac
 done
-normalize_scgi_settings
-
 if [[ "${RTORRENT_WITH_XMLRPC_C:-0}" == "1" ]]; then
     RTORRENT_BUILD_FROM_SOURCE=1
     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 - <<'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
+
 command -v pacman >/dev/null 2>&1 || { echo "pacman is required on Arch Linux." >&2; exit 1; }
 pacman -Sy --noconfirm --needed ca-certificates curl tar gzip sudo python python-pip git rsync rtorrent
 
@@ -112,19 +102,12 @@ write_rtorrent_config() {
         echo "Keeping existing config: ${config}"
         return
     fi
-    local scgi_line
-    if [[ "${RTORRENT_SCGI_BACKEND}" == "unix" ]]; then
-        scgi_line="network.scgi.open_local = ${RTORRENT_SCGI_SOCKET}
-execute.nothrow = chmod,660,${RTORRENT_SCGI_SOCKET}"
-    else
-        scgi_line="network.scgi.open_port = 127.0.0.1:${RTORRENT_SCGI_PORT}"
-    fi
     cat > "${config}" <<EOF_CONFIG
 directory.default.set = ${RTORRENT_HOME}/downloads
 session.path.set = ${RTORRENT_HOME}/.session
 encoding.add = UTF-8
 
-${scgi_line}
+$(if [[ "${RTORRENT_SCGI_BACKEND}" == "unix" ]]; then printf 'network.scgi.open_local = %s\n' "${RTORRENT_SCGI_SOCKET}"; else printf 'network.scgi.open_port = 127.0.0.1:%s\n' "${RTORRENT_SCGI_PORT}"; fi)
 network.port_range.set = ${RTORRENT_TORRENT_PORT}-${RTORRENT_TORRENT_PORT}
 network.port_random.set = no
 network.bind_address.ipv4.set = 0.0.0.0
@@ -168,13 +151,6 @@ EOF_CONFIG
 }
 
 write_rtorrent_service() {
-    local runtime_lines=""
-    if [[ "${RTORRENT_SCGI_BACKEND}" == "unix" && "${RTORRENT_SCGI_SOCKET}" == /run/* ]]; then
-        local runtime_dir
-        runtime_dir="$(printf '%s' "${RTORRENT_SCGI_SOCKET}" | cut -d/ -f3)"
-        runtime_lines="RuntimeDirectory=${runtime_dir}
-RuntimeDirectoryMode=0750"
-    fi
     cat > /etc/systemd/system/rtorrent@.service <<EOF_SERVICE
 [Unit]
 Description=rTorrent for %I
@@ -185,7 +161,8 @@ Type=simple
 User=%I
 Group=%I
 KillMode=process
-${runtime_lines}
+RuntimeDirectory=${RTORRENT_USER}
+RuntimeDirectoryMode=0750
 WorkingDirectory=${RTORRENT_HOME}
 ExecStartPre=-/bin/rm -f ${RTORRENT_HOME}/.session/rtorrent.lock
 ExecStart=/usr/bin/rtorrent -o system.daemon.set=true -n -o import=${RTORRENT_HOME}/.rtorrent.rc
@@ -213,6 +190,9 @@ if [[ "${RTORRENT_BUILD_FROM_SOURCE}" == "1" ]]; then
         RTORRENT_INSTALL_ARGS+=(--debug)
     fi
 
+    if [[ "${RTORRENT_SCGI_BACKEND}" == "unix" ]]; then
+        RTORRENT_INSTALL_ARGS+=(--scgi-unix-socket "${RTORRENT_SCGI_SOCKET}")
+    fi
     python "${SCRIPT_DIR}/install_rtorrent.py" \
         "${RTORRENT_INSTALL_ARGS[@]}" \
         --force-config \
@@ -221,8 +201,6 @@ if [[ "${RTORRENT_BUILD_FROM_SOURCE}" == "1" ]]; then
         --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}"
@@ -233,25 +211,26 @@ else
 fi
 
 cd "${PROJECT_DIR}"
-PYTORRENT_APP_DIR="${PYTORRENT_APP_DIR}" \
+PYTORRENT_ONLY_ARGS=(
-PYTORRENT_PORT="${PYTORRENT_PORT}" \
+    --yes
-PYTORRENT_SERVICE_NAME="${PYTORRENT_SERVICE_NAME}" \
+    --app-dir "${PYTORRENT_APP_DIR}"
-PYTORRENT_RTORRENT_SCGI_URL="${PYTORRENT_RTORRENT_SCGI_URL}" \
+    --port "${PYTORRENT_PORT}"
-PYTORRENT_INSTALL_SCGI_PROXY="$([[ "${RTORRENT_SCGI_BACKEND}" == "unix" ]] && echo yes || echo no)" \
+    --service-name "${PYTORRENT_SERVICE_NAME}"
-RTORRENT_USER="${RTORRENT_USER}" \
+    --profile-name "${PYTORRENT_PROFILE_NAME}"
-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 [[ "${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[@]}"
 
 if [[ -n "${PYTORRENT_API_TOKEN}" ]]; then
     "${PYTORRENT_APP_DIR}/venv/bin/python" "${PYTORRENT_APP_DIR}/scripts/stack_installers/configure_pytorrent_api.py" \

scripts/stack_installers/install_stack_debian_ubuntu.sh

@@ -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:-}"
+RTORRENT_SCGI_BACKEND="${RTORRENT_SCGI_BACKEND:-tcp}"
-
+RTORRENT_SCGI_SOCKET="${RTORRENT_SCGI_SOCKET:-/run/rtorrent/rtorrent.sock}"
-normalize_scgi_settings() {
+RTORRENT_SCGI_PROXY_LISTEN="${RTORRENT_SCGI_PROXY_LISTEN:-127.0.0.1:5050}"
-    case "${RTORRENT_SCGI_BACKEND}" in
+RTORRENT_SCGI_PROXY_TOKEN="${RTORRENT_SCGI_PROXY_TOKEN:-}"
-        tcp|unix) ;;
+PYTORRENT_RTORRENT_SCGI_URL="${PYTORRENT_RTORRENT_SCGI_URL:-scgi://127.0.0.1:${RTORRENT_SCGI_PORT}}"
-        *) 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_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}"
+PYTORRENT_ONLY_ARGS=(
-
+    --yes
-if [[ -n "${PYTORRENT_API_TOKEN}" ]]; then
+    --app-dir "${PYTORRENT_APP_DIR}"
-    "${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}"
+    --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}"

scripts/stack_installers/install_stack_rhel.sh

@@ -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:-}"
+RTORRENT_SCGI_BACKEND="${RTORRENT_SCGI_BACKEND:-tcp}"
-
+RTORRENT_SCGI_SOCKET="${RTORRENT_SCGI_SOCKET:-/run/rtorrent/rtorrent.sock}"
-normalize_scgi_settings() {
+RTORRENT_SCGI_PROXY_LISTEN="${RTORRENT_SCGI_PROXY_LISTEN:-127.0.0.1:5050}"
-    case "${RTORRENT_SCGI_BACKEND}" in
+RTORRENT_SCGI_PROXY_TOKEN="${RTORRENT_SCGI_PROXY_TOKEN:-}"
-        tcp|unix) ;;
+PYTORRENT_RTORRENT_SCGI_URL="${PYTORRENT_RTORRENT_SCGI_URL:-scgi://127.0.0.1:${RTORRENT_SCGI_PORT}}"
-        *) 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_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
 
@@ -142,6 +131,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_rhel.py" \
     "${RTORRENT_INSTALL_ARGS[@]}" \
@@ -150,17 +142,30 @@ python3 "${SCRIPT_DIR}/install_rtorrent_rhel.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}"
+PYTORRENT_ONLY_ARGS=(
-
+    --yes
-if [[ -n "${PYTORRENT_API_TOKEN}" ]]; then
+    --app-dir "${PYTORRENT_APP_DIR}"
-    "${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}"
+    --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}"