Compare commits
6 Commits
main
...
9635aecb81
| Author | SHA1 | Date | |
|---|---|---|---|
| 9635aecb81 | |||
| a37b6f6112 | |||
| f766e5f71e | |||
| f86a5f1b39 | |||
| b464a8cea2 | |||
|
b97ed1e90c
|
@@ -127,7 +127,8 @@ let
|
||||
|
||||
configFile = pkgs.writeText "bazarr-init-config.json" mkBazarrInitConfig;
|
||||
|
||||
bazarrDeps = [
|
||||
bazarrDeps =
|
||||
[
|
||||
"bazarr.service"
|
||||
]
|
||||
++ (lib.optional cfg.sonarr.enable "${cfg.sonarr.serviceName}.service")
|
||||
@@ -167,7 +168,8 @@ in
|
||||
StartLimitIntervalSec = 5 * (cfg.apiTimeout + 30);
|
||||
StartLimitBurst = 5;
|
||||
};
|
||||
serviceConfig = {
|
||||
serviceConfig =
|
||||
{
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
Restart = "on-failure";
|
||||
|
||||
@@ -128,7 +128,10 @@ let
|
||||
sonarr = {
|
||||
profileName = cfg.sonarr.profileName;
|
||||
animeProfileName =
|
||||
if cfg.sonarr.animeProfileName != null then cfg.sonarr.animeProfileName else cfg.sonarr.profileName;
|
||||
if cfg.sonarr.animeProfileName != null then
|
||||
cfg.sonarr.animeProfileName
|
||||
else
|
||||
cfg.sonarr.profileName;
|
||||
dataDir = cfg.sonarr.dataDir;
|
||||
bindAddress = cfg.sonarr.bindAddress;
|
||||
port = cfg.sonarr.port;
|
||||
@@ -178,7 +181,8 @@ in
|
||||
StartLimitIntervalSec = 5 * (cfg.apiTimeout + 30);
|
||||
StartLimitBurst = 5;
|
||||
};
|
||||
serviceConfig = {
|
||||
serviceConfig =
|
||||
{
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
Restart = "on-failure";
|
||||
|
||||
@@ -216,7 +216,7 @@ let
|
||||
|
||||
healthChecks = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
default = true;
|
||||
description = ''
|
||||
When enabled, the init service will verify connectivity after provisioning:
|
||||
- Tests all download clients are reachable via the application's testall API
|
||||
@@ -271,31 +271,6 @@ let
|
||||
seriesFolderFormat = "{Series Title}";
|
||||
};
|
||||
};
|
||||
|
||||
configXml = lib.mkOption {
|
||||
type = lib.types.attrsOf (
|
||||
lib.types.oneOf [
|
||||
lib.types.str
|
||||
lib.types.int
|
||||
lib.types.bool
|
||||
]
|
||||
);
|
||||
default = { };
|
||||
description = ''
|
||||
XML elements to ensure in the service's config.xml before startup.
|
||||
Each key-value pair corresponds to a direct child element of the
|
||||
<Config> root. Existing elements are updated if their value differs;
|
||||
new elements are added. Undeclared elements are preserved.
|
||||
|
||||
This runs as a preStart hook on the main service, guaranteeing
|
||||
config.xml is correct before the application reads it.
|
||||
'';
|
||||
example = {
|
||||
Port = 9696;
|
||||
BindAddress = "*";
|
||||
AnalyticsEnabled = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -349,16 +324,6 @@ let
|
||||
) inst.downloadClients;
|
||||
|
||||
enabledInstances = lib.filterAttrs (_: inst: inst.enable) cfg;
|
||||
configXmlInstances = lib.filterAttrs (_: inst: inst.configXml != { }) enabledInstances;
|
||||
|
||||
mkConfigXmlFile =
|
||||
name: inst:
|
||||
pkgs.writeText "${name}-config-xml.json" (
|
||||
builtins.toJSON {
|
||||
inherit (inst) dataDir;
|
||||
elements = inst.configXml;
|
||||
}
|
||||
);
|
||||
|
||||
# Shared hardening options for all init services.
|
||||
hardeningConfig = {
|
||||
@@ -384,31 +349,12 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf (enabledInstances != { }) {
|
||||
assertions =
|
||||
let
|
||||
configXmlTargets = map (inst: inst.serviceName) (builtins.attrValues configXmlInstances);
|
||||
in
|
||||
[
|
||||
{
|
||||
# Two arrInit entries targeting the same systemd service with configXml
|
||||
# would silently collide on the preStart definition; only one would win.
|
||||
# Force the user to deduplicate instead of producing surprising behaviour.
|
||||
assertion = (lib.length configXmlTargets) == (lib.length (lib.unique configXmlTargets));
|
||||
message = ''
|
||||
services.arrInit: multiple entries target the same serviceName with configXml.
|
||||
Each systemd service may have configXml defined by at most one arrInit entry.
|
||||
Targets: ${lib.concatStringsSep ", " configXmlTargets}
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services =
|
||||
# Init services: oneshot units that configure the app via HTTP API
|
||||
(lib.mapAttrs' (
|
||||
systemd.services = lib.mapAttrs' (
|
||||
name: inst:
|
||||
lib.nameValuePair "${inst.serviceName}-init" {
|
||||
description = "Initialize ${name} API connections";
|
||||
after = [
|
||||
after =
|
||||
[
|
||||
"${inst.serviceName}.service"
|
||||
]
|
||||
++ (getSyncedAppDeps inst)
|
||||
@@ -421,7 +367,8 @@ in
|
||||
StartLimitIntervalSec = 5 * (inst.apiTimeout + 30);
|
||||
StartLimitBurst = 5;
|
||||
};
|
||||
serviceConfig = {
|
||||
serviceConfig =
|
||||
{
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
Restart = "on-failure";
|
||||
@@ -433,15 +380,6 @@ in
|
||||
NetworkNamespacePath = inst.networkNamespacePath;
|
||||
};
|
||||
}
|
||||
) enabledInstances)
|
||||
# config.xml preStart: ensure declared elements exist before the service reads them
|
||||
// (lib.mapAttrs' (
|
||||
name: inst:
|
||||
lib.nameValuePair inst.serviceName {
|
||||
preStart = lib.mkBefore (
|
||||
"${pythonEnv}/bin/python3 ${scriptDir}/ensure_config_xml.py ${mkConfigXmlFile name inst}"
|
||||
);
|
||||
}
|
||||
) configXmlInstances);
|
||||
) enabledInstances;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,143 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Ensure a Servarr config.xml contains required elements before startup.
|
||||
|
||||
Reads a JSON config specifying the data directory and desired XML elements,
|
||||
then creates or patches config.xml to include them. Existing values for
|
||||
declared elements are overwritten; undeclared elements are preserved.
|
||||
|
||||
Invariants:
|
||||
- The write is atomic (temp file + rename); partial writes cannot leave
|
||||
a corrupt config.xml that would prevent the service from starting.
|
||||
- Malformed input config.xml is replaced with a fresh <Config> root
|
||||
rather than blocking startup forever.
|
||||
- Existing file permissions are preserved across rewrites.
|
||||
- The dataDir is created if missing; the app can then write into it.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import io
|
||||
import json
|
||||
import os
|
||||
import stat
|
||||
import sys
|
||||
import xml.etree.ElementTree as ET
|
||||
|
||||
|
||||
def to_xml_text(value) -> str:
|
||||
"""Convert a JSON-decoded value to the text Servarr expects.
|
||||
|
||||
- bool -> "True"/"False" (C# XmlSerializer capitalisation)
|
||||
- everything else -> str(value)
|
||||
"""
|
||||
# bool must be checked before int since bool is a subclass of int
|
||||
if isinstance(value, bool):
|
||||
return "True" if value else "False"
|
||||
return str(value)
|
||||
|
||||
|
||||
def load_root(config_xml_path: str) -> tuple[ET.Element, bool]:
|
||||
"""Parse existing config.xml or return a fresh <Config> root.
|
||||
|
||||
Returns (root, existed) where existed is False if the file was missing
|
||||
or malformed and a new root was generated.
|
||||
"""
|
||||
if not os.path.isfile(config_xml_path):
|
||||
return ET.Element("Config"), False
|
||||
|
||||
try:
|
||||
tree = ET.parse(config_xml_path)
|
||||
return tree.getroot(), True
|
||||
except ET.ParseError as exc:
|
||||
print(
|
||||
f"Warning: {config_xml_path} is malformed ({exc}); "
|
||||
"rewriting with a fresh <Config> root",
|
||||
file=sys.stderr,
|
||||
)
|
||||
return ET.Element("Config"), False
|
||||
|
||||
|
||||
def patch_root(root: ET.Element, elements: dict) -> bool:
|
||||
"""Patch root in place with declared elements. Returns True if changed."""
|
||||
changed = False
|
||||
for key, value in elements.items():
|
||||
text = to_xml_text(value)
|
||||
node = root.find(key)
|
||||
if node is None:
|
||||
ET.SubElement(root, key).text = text
|
||||
changed = True
|
||||
print(f"Added <{key}>{text}</{key}>")
|
||||
elif node.text != text:
|
||||
old = node.text
|
||||
node.text = text
|
||||
changed = True
|
||||
print(f"Updated <{key}> from {old!r} to {text!r}")
|
||||
return changed
|
||||
|
||||
|
||||
def serialize(root: ET.Element) -> str:
|
||||
"""Pretty-print the XML tree to a string with trailing newline."""
|
||||
tree = ET.ElementTree(root)
|
||||
ET.indent(tree, space=" ")
|
||||
buf = io.StringIO()
|
||||
tree.write(buf, encoding="unicode", xml_declaration=False)
|
||||
content = buf.getvalue()
|
||||
if not content.endswith("\n"):
|
||||
content += "\n"
|
||||
return content
|
||||
|
||||
|
||||
def atomic_write(path: str, content: str, mode: int | None) -> None:
|
||||
"""Write content to path atomically, preserving permissions."""
|
||||
tmp = f"{path}.tmp.{os.getpid()}"
|
||||
try:
|
||||
with open(tmp, "w") as f:
|
||||
f.write(content)
|
||||
if mode is not None:
|
||||
os.chmod(tmp, mode)
|
||||
os.replace(tmp, path)
|
||||
except Exception:
|
||||
# Best-effort cleanup; don't mask the real error
|
||||
try:
|
||||
os.unlink(tmp)
|
||||
except FileNotFoundError:
|
||||
pass
|
||||
raise
|
||||
|
||||
|
||||
def main() -> None:
|
||||
if len(sys.argv) < 2:
|
||||
print("Usage: ensure_config_xml.py <config.json>", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
with open(sys.argv[1]) as f:
|
||||
cfg = json.load(f)
|
||||
|
||||
data_dir = cfg["dataDir"]
|
||||
elements = cfg["elements"]
|
||||
|
||||
if not elements:
|
||||
return
|
||||
|
||||
os.makedirs(data_dir, exist_ok=True)
|
||||
config_xml_path = os.path.join(data_dir, "config.xml")
|
||||
|
||||
root, existed = load_root(config_xml_path)
|
||||
# Preserve existing mode if the file exists; otherwise default to 0600
|
||||
# since config.xml contains ApiKey and must not be world-readable.
|
||||
mode = (
|
||||
stat.S_IMODE(os.stat(config_xml_path).st_mode) if existed else 0o600
|
||||
)
|
||||
|
||||
changed = patch_root(root, elements)
|
||||
|
||||
if not changed and existed:
|
||||
print(f"{config_xml_path} already correct")
|
||||
return
|
||||
|
||||
atomic_write(config_xml_path, serialize(root), mode)
|
||||
print(f"Wrote {config_xml_path}")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -42,17 +42,9 @@ def _dict_to_fields(d):
|
||||
|
||||
|
||||
def _needs_field_update(desired, current_fields):
|
||||
"""Return True if any desired field value differs from the current state.
|
||||
|
||||
Skips fields that the API returns masked (e.g. '********' for API keys
|
||||
and passwords) since comparison against the real value always shows drift.
|
||||
"""
|
||||
"""Return True if any desired field value differs from the current state."""
|
||||
current = _fields_to_dict(current_fields)
|
||||
return any(
|
||||
desired.get(k) != current.get(k)
|
||||
for k in desired
|
||||
if current.get(k) != "********"
|
||||
)
|
||||
return any(desired.get(k) != current.get(k) for k in desired)
|
||||
|
||||
|
||||
# -- Download clients --------------------------------------------------------
|
||||
|
||||
@@ -1,183 +0,0 @@
|
||||
{
|
||||
pkgs,
|
||||
self,
|
||||
}:
|
||||
|
||||
pkgs.testers.runNixOSTest {
|
||||
name = "arr-init-config-xml";
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
imports = [ self.nixosModules.default ];
|
||||
|
||||
system.stateVersion = "24.11";
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
libxml2
|
||||
gnugrep
|
||||
];
|
||||
|
||||
services.sonarr = {
|
||||
enable = true;
|
||||
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
||||
settings.server.port = lib.mkDefault 8989;
|
||||
};
|
||||
|
||||
services.prowlarr = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
# Sonarr: declare configXml to ensure Port and BindAddress
|
||||
services.arrInit.sonarr = {
|
||||
enable = true;
|
||||
serviceName = "sonarr";
|
||||
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
||||
port = 8989;
|
||||
configXml = {
|
||||
Port = 8989;
|
||||
BindAddress = "*";
|
||||
AnalyticsEnabled = false;
|
||||
};
|
||||
};
|
||||
|
||||
# Prowlarr: declare configXml to ensure Port — dataDir starts empty,
|
||||
# so preStart must create config.xml from scratch.
|
||||
services.arrInit.prowlarr = {
|
||||
enable = true;
|
||||
serviceName = "prowlarr";
|
||||
dataDir = "/var/lib/prowlarr";
|
||||
port = 9696;
|
||||
apiVersion = "v1";
|
||||
configXml = {
|
||||
Port = 9696;
|
||||
BindAddress = "*";
|
||||
EnableSsl = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
import xml.etree.ElementTree as ET
|
||||
|
||||
|
||||
def elem_text(xml: str, tag: str) -> str:
|
||||
"""Return the text of root.<tag>. Asserts element exists."""
|
||||
root = ET.fromstring(xml)
|
||||
node = root.find(tag)
|
||||
assert node is not None, f"<{tag}> missing from config.xml"
|
||||
assert node.text is not None, f"<{tag}> has no text in config.xml"
|
||||
return node.text
|
||||
|
||||
|
||||
start_all()
|
||||
|
||||
# --- Subtest: config.xml created from scratch when missing ---
|
||||
|
||||
with subtest("preStart creates config.xml if missing"):
|
||||
# Prowlarr's dataDir starts empty; preStart must create config.xml
|
||||
# before the service main process reads it.
|
||||
machine.wait_for_unit("prowlarr.service")
|
||||
machine.succeed("test -f /var/lib/prowlarr/config.xml")
|
||||
|
||||
with subtest("created config.xml has declared elements"):
|
||||
xml = machine.succeed("cat /var/lib/prowlarr/config.xml")
|
||||
assert elem_text(xml, "Port") == "9696", f"Port={elem_text(xml, 'Port')}"
|
||||
assert elem_text(xml, "BindAddress") == "*"
|
||||
assert elem_text(xml, "EnableSsl") == "False"
|
||||
|
||||
with subtest("config.xml is well-formed XML"):
|
||||
xml = machine.succeed("cat /var/lib/prowlarr/config.xml")
|
||||
# Must parse cleanly; will raise if malformed
|
||||
ET.fromstring(xml)
|
||||
|
||||
# --- Subtest: config.xml patched when elements are missing ---
|
||||
|
||||
with subtest("preStart patches existing config.xml with missing elements"):
|
||||
# Flow for a fresh dataDir:
|
||||
# 1. preStart creates config.xml with only declared elements
|
||||
# 2. Sonarr starts, reads it, generates ApiKey, writes back
|
||||
# We must wait for step 2 (ApiKey present) before asserting.
|
||||
machine.wait_for_unit("sonarr.service")
|
||||
machine.wait_until_succeeds(
|
||||
"grep -q '<ApiKey>' /var/lib/sonarr/.config/NzbDrone/config.xml",
|
||||
timeout=120,
|
||||
)
|
||||
xml = machine.succeed("cat /var/lib/sonarr/.config/NzbDrone/config.xml")
|
||||
assert elem_text(xml, "Port") == "8989"
|
||||
assert elem_text(xml, "BindAddress") == "*"
|
||||
assert elem_text(xml, "AnalyticsEnabled") == "False"
|
||||
|
||||
with subtest("preStart preserves undeclared elements"):
|
||||
# Restart Sonarr: preStart runs again over existing config.xml with
|
||||
# an ApiKey. Our declared elements are re-applied, but ApiKey must survive.
|
||||
machine.succeed("systemctl restart sonarr.service")
|
||||
machine.wait_for_unit("sonarr.service")
|
||||
xml = machine.succeed("cat /var/lib/sonarr/.config/NzbDrone/config.xml")
|
||||
api_key = elem_text(xml, "ApiKey")
|
||||
assert len(api_key) > 0, "ApiKey is empty"
|
||||
|
||||
# --- Subtest: preStart corrects wrong values ---
|
||||
|
||||
with subtest("preStart fixes incorrect values on restart"):
|
||||
# Tamper with the Port value
|
||||
machine.succeed(
|
||||
"sed -i 's|<Port>9696</Port>|<Port>1234</Port>|' /var/lib/prowlarr/config.xml"
|
||||
)
|
||||
machine.succeed("grep '<Port>1234</Port>' /var/lib/prowlarr/config.xml")
|
||||
|
||||
# Restart the service; preStart should fix it
|
||||
machine.succeed("systemctl restart prowlarr.service")
|
||||
machine.wait_for_unit("prowlarr.service")
|
||||
|
||||
xml = machine.succeed("cat /var/lib/prowlarr/config.xml")
|
||||
assert elem_text(xml, "Port") == "9696", "Port not corrected"
|
||||
|
||||
# --- Subtest: idempotency ---
|
||||
|
||||
with subtest("preStart is idempotent: bit-for-bit identical after restart"):
|
||||
xml_before = machine.succeed("cat /var/lib/prowlarr/config.xml")
|
||||
machine.succeed("systemctl restart prowlarr.service")
|
||||
machine.wait_for_unit("prowlarr.service")
|
||||
xml_after = machine.succeed("cat /var/lib/prowlarr/config.xml")
|
||||
assert xml_before == xml_after, (
|
||||
"config.xml changed on idempotent restart"
|
||||
)
|
||||
|
||||
# --- Subtest: malformed XML recovery ---
|
||||
|
||||
with subtest("preStart recovers from malformed config.xml"):
|
||||
# Corrupt the file completely
|
||||
machine.succeed(
|
||||
"echo 'not <valid/> xml <<<' > /var/lib/prowlarr/config.xml"
|
||||
)
|
||||
machine.succeed("systemctl restart prowlarr.service")
|
||||
machine.wait_for_unit("prowlarr.service")
|
||||
|
||||
xml = machine.succeed("cat /var/lib/prowlarr/config.xml")
|
||||
# Should be a fresh <Config> with declared elements
|
||||
ET.fromstring(xml)
|
||||
assert elem_text(xml, "Port") == "9696"
|
||||
assert elem_text(xml, "BindAddress") == "*"
|
||||
|
||||
# --- Subtest: file ownership preserved ---
|
||||
|
||||
with subtest("preStart preserves ownership of config.xml"):
|
||||
# Prowlarr uses DynamicUser; owner is dynamic. Just verify the service
|
||||
# can read its own config.xml after preStart.
|
||||
machine.succeed("systemctl restart prowlarr.service")
|
||||
machine.wait_for_unit("prowlarr.service")
|
||||
# If ownership were wrong, the service would fail to start or read.
|
||||
# The unit being active is sufficient evidence.
|
||||
|
||||
# --- Subtest: preStart permissions are sensible ---
|
||||
|
||||
with subtest("config.xml has non-world-readable perms"):
|
||||
# ApiKey is sensitive; config.xml must not be world-readable.
|
||||
mode = machine.succeed(
|
||||
"stat -c %a /var/lib/sonarr/.config/NzbDrone/config.xml"
|
||||
).strip()
|
||||
# Last digit must be 0 (no 'other' permissions)
|
||||
assert mode.endswith("0"), f"config.xml world-readable: mode={mode}"
|
||||
'';
|
||||
}
|
||||
@@ -16,5 +16,4 @@
|
||||
naming = import ./naming.nix { inherit pkgs lib self; };
|
||||
network-namespace = import ./network-namespace.nix { inherit pkgs lib self; };
|
||||
permanent-failure = import ./permanent-failure.nix { inherit pkgs lib self; };
|
||||
config-xml = import ./config-xml.nix { inherit pkgs self; };
|
||||
}
|
||||
|
||||
@@ -97,6 +97,7 @@ pkgs.testers.runNixOSTest {
|
||||
];
|
||||
|
||||
services.arrInit.sonarr = {
|
||||
healthChecks = false;
|
||||
enable = true;
|
||||
serviceName = "mock-sonarr";
|
||||
dataDir = "/var/lib/mock-sonarr";
|
||||
|
||||
@@ -45,6 +45,7 @@ pkgs.testers.runNixOSTest {
|
||||
# Test 3: Path with spaces
|
||||
services.arrInit.sonarr = {
|
||||
enable = true;
|
||||
healthChecks = false;
|
||||
serviceName = "sonarr";
|
||||
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
||||
port = 8989;
|
||||
|
||||
@@ -26,6 +26,7 @@ pkgs.testers.runNixOSTest {
|
||||
# The dataDir points to a non-existent config.xml
|
||||
services.arrInit.sonarr = {
|
||||
enable = true;
|
||||
healthChecks = false;
|
||||
serviceName = "sonarr";
|
||||
dataDir = "/var/lib/nonexistent";
|
||||
port = 8989;
|
||||
|
||||
@@ -27,14 +27,8 @@ pkgs.testers.runNixOSTest {
|
||||
|
||||
systemd.services.mock-qbittorrent = mocks.mkMockQbittorrent {
|
||||
initialCategories = {
|
||||
tv = {
|
||||
name = "tv";
|
||||
savePath = "/downloads";
|
||||
};
|
||||
movies = {
|
||||
name = "movies";
|
||||
savePath = "/downloads";
|
||||
};
|
||||
tv = { name = "tv"; savePath = "/downloads"; };
|
||||
movies = { name = "movies"; savePath = "/downloads"; };
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -27,19 +27,10 @@ pkgs.testers.runNixOSTest {
|
||||
|
||||
systemd.services.mock-qbittorrent = mocks.mkMockQbittorrent {
|
||||
initialCategories = {
|
||||
tv = {
|
||||
name = "tv";
|
||||
savePath = "/downloads";
|
||||
tv = { name = "tv"; savePath = "/downloads"; };
|
||||
movies = { name = "movies"; savePath = "/downloads"; };
|
||||
};
|
||||
movies = {
|
||||
name = "movies";
|
||||
savePath = "/downloads";
|
||||
};
|
||||
};
|
||||
before = [
|
||||
"sonarr-init.service"
|
||||
"radarr-init.service"
|
||||
];
|
||||
before = [ "sonarr-init.service" "radarr-init.service" ];
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
@@ -70,6 +61,7 @@ pkgs.testers.runNixOSTest {
|
||||
|
||||
services.arrInit.sonarr = {
|
||||
enable = true;
|
||||
healthChecks = false;
|
||||
serviceName = "sonarr";
|
||||
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
||||
port = 8989;
|
||||
@@ -92,6 +84,7 @@ pkgs.testers.runNixOSTest {
|
||||
|
||||
services.arrInit.radarr = {
|
||||
enable = true;
|
||||
healthChecks = false;
|
||||
serviceName = "radarr";
|
||||
dataDir = "/var/lib/radarr/.config/Radarr";
|
||||
port = 7878;
|
||||
@@ -114,6 +107,7 @@ pkgs.testers.runNixOSTest {
|
||||
|
||||
services.arrInit.prowlarr = {
|
||||
enable = true;
|
||||
healthChecks = false;
|
||||
serviceName = "prowlarr";
|
||||
dataDir = "/var/lib/prowlarr";
|
||||
port = 9696;
|
||||
|
||||
@@ -85,9 +85,7 @@
|
||||
|
||||
# Mock SABnzbd API.
|
||||
mkMockSabnzbd =
|
||||
{
|
||||
port ? 6012,
|
||||
}:
|
||||
{ port ? 6012 }:
|
||||
let
|
||||
mockScript = pkgs.writeScript "mock-sabnzbd.py" ''
|
||||
import json
|
||||
|
||||
@@ -28,10 +28,7 @@ pkgs.testers.runNixOSTest {
|
||||
# Mock qBittorrent on port 6011
|
||||
systemd.services.mock-qbittorrent = mocks.mkMockQbittorrent {
|
||||
initialCategories = {
|
||||
tv = {
|
||||
name = "tv";
|
||||
savePath = "/downloads";
|
||||
};
|
||||
tv = { name = "tv"; savePath = "/downloads"; };
|
||||
};
|
||||
};
|
||||
|
||||
@@ -51,6 +48,7 @@ pkgs.testers.runNixOSTest {
|
||||
# Sonarr with TWO download clients: qBittorrent + SABnzbd
|
||||
services.arrInit.sonarr = {
|
||||
enable = true;
|
||||
healthChecks = false;
|
||||
serviceName = "sonarr";
|
||||
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
||||
port = 8989;
|
||||
|
||||
@@ -1,21 +1,11 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
self,
|
||||
}:
|
||||
{ pkgs, lib, self }:
|
||||
pkgs.testers.runNixOSTest {
|
||||
name = "arr-init-naming";
|
||||
nodes.machine =
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
nodes.machine = { pkgs, lib, ... }: {
|
||||
imports = [ self.nixosModules.default ];
|
||||
system.stateVersion = "24.11";
|
||||
virtualisation.memorySize = 4096;
|
||||
environment.systemPackages = with pkgs; [
|
||||
curl
|
||||
jq
|
||||
gnugrep
|
||||
];
|
||||
environment.systemPackages = with pkgs; [ curl jq gnugrep ];
|
||||
|
||||
services.sonarr = {
|
||||
enable = true;
|
||||
@@ -28,6 +18,7 @@ pkgs.testers.runNixOSTest {
|
||||
serviceName = "sonarr";
|
||||
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
||||
port = 8989;
|
||||
healthChecks = false;
|
||||
naming = {
|
||||
renameEpisodes = true;
|
||||
standardEpisodeFormat = "{Series Title} - S{season:00}E{episode:00} - {Episode Title} {Quality Full}";
|
||||
|
||||
@@ -1,22 +1,11 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
self,
|
||||
}:
|
||||
{ pkgs, lib, self }:
|
||||
pkgs.testers.runNixOSTest {
|
||||
name = "arr-init-network-namespace";
|
||||
nodes.machine =
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
nodes.machine = { pkgs, lib, ... }: {
|
||||
imports = [ self.nixosModules.default ];
|
||||
system.stateVersion = "24.11";
|
||||
virtualisation.memorySize = 2048;
|
||||
environment.systemPackages = with pkgs; [
|
||||
curl
|
||||
jq
|
||||
gnugrep
|
||||
iproute2
|
||||
];
|
||||
environment.systemPackages = with pkgs; [ curl jq gnugrep iproute2 ];
|
||||
|
||||
# Create the network namespace with loopback
|
||||
systemd.services.create-netns = {
|
||||
@@ -33,8 +22,7 @@ pkgs.testers.runNixOSTest {
|
||||
};
|
||||
|
||||
# Mock Servarr API running inside the namespace
|
||||
systemd.services.mock-sonarr =
|
||||
let
|
||||
systemd.services.mock-sonarr = let
|
||||
mockScript = pkgs.writeScript "mock-sonarr-ns.py" ''
|
||||
import json
|
||||
from http.server import HTTPServer, BaseHTTPRequestHandler
|
||||
@@ -78,8 +66,7 @@ pkgs.testers.runNixOSTest {
|
||||
|
||||
HTTPServer(("0.0.0.0", 8989), MockArr).serve_forever()
|
||||
'';
|
||||
in
|
||||
{
|
||||
in {
|
||||
description = "Mock Sonarr API in network namespace";
|
||||
after = [ "create-netns.service" ];
|
||||
requires = [ "create-netns.service" ];
|
||||
@@ -103,6 +90,7 @@ pkgs.testers.runNixOSTest {
|
||||
serviceName = "mock-sonarr";
|
||||
dataDir = "/var/lib/mock-sonarr";
|
||||
port = 8989;
|
||||
healthChecks = false;
|
||||
networkNamespacePath = "/run/netns/test-ns";
|
||||
networkNamespaceService = "create-netns";
|
||||
rootFolders = [ "/media/tv" ];
|
||||
|
||||
@@ -50,6 +50,7 @@ pkgs.testers.runNixOSTest {
|
||||
# Test 1: Only rootFolders (no downloadClients)
|
||||
services.arrInit.sonarr = {
|
||||
enable = true;
|
||||
healthChecks = false;
|
||||
serviceName = "sonarr";
|
||||
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
||||
port = 8989;
|
||||
@@ -61,6 +62,7 @@ pkgs.testers.runNixOSTest {
|
||||
# Test 2: Only downloadClients (no rootFolders)
|
||||
services.arrInit.radarr = {
|
||||
enable = true;
|
||||
healthChecks = false;
|
||||
serviceName = "radarr";
|
||||
dataDir = "/var/lib/radarr/.config/Radarr";
|
||||
port = 7878;
|
||||
@@ -85,6 +87,7 @@ pkgs.testers.runNixOSTest {
|
||||
# Test 3: Only syncedApps (Prowlarr)
|
||||
services.arrInit.prowlarr = {
|
||||
enable = true;
|
||||
healthChecks = false;
|
||||
serviceName = "prowlarr";
|
||||
dataDir = "/var/lib/prowlarr";
|
||||
port = 9696;
|
||||
|
||||
@@ -1,25 +1,14 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
self,
|
||||
}:
|
||||
{ pkgs, lib, self }:
|
||||
pkgs.testers.runNixOSTest {
|
||||
name = "arr-init-permanent-failure";
|
||||
nodes.machine =
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
nodes.machine = { pkgs, lib, ... }: {
|
||||
imports = [ self.nixosModules.default ];
|
||||
system.stateVersion = "24.11";
|
||||
virtualisation.memorySize = 2048;
|
||||
environment.systemPackages = with pkgs; [
|
||||
curl
|
||||
jq
|
||||
gnugrep
|
||||
];
|
||||
environment.systemPackages = with pkgs; [ curl jq gnugrep ];
|
||||
|
||||
# Mock that always returns 503
|
||||
systemd.services.mock-sonarr =
|
||||
let
|
||||
systemd.services.mock-sonarr = let
|
||||
mockScript = pkgs.writeScript "mock-sonarr-fail.py" ''
|
||||
from http.server import HTTPServer, BaseHTTPRequestHandler
|
||||
|
||||
@@ -38,8 +27,7 @@ pkgs.testers.runNixOSTest {
|
||||
|
||||
HTTPServer(("0.0.0.0", 8989), FailMock).serve_forever()
|
||||
'';
|
||||
in
|
||||
{
|
||||
in {
|
||||
description = "Mock Sonarr that never becomes ready";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
@@ -59,6 +47,7 @@ pkgs.testers.runNixOSTest {
|
||||
serviceName = "mock-sonarr";
|
||||
dataDir = "/var/lib/mock-sonarr";
|
||||
port = 8989;
|
||||
healthChecks = false;
|
||||
# Very short timeout so retries happen fast
|
||||
apiTimeout = 3;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user