Compare commits
5 Commits
9635aecb81
...
a1ae022dc3
| Author | SHA1 | Date | |
|---|---|---|---|
| a1ae022dc3 | |||
| df1d715257 | |||
| a6518b507c | |||
| 948c9e3a38 | |||
| a7d9b269df |
34
flake.lock
generated
34
flake.lock
generated
@@ -1,23 +1,5 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"flake-utils": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731533236,
|
|
||||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771848320,
|
"lastModified": 1771848320,
|
||||||
@@ -36,24 +18,8 @@
|
|||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils",
|
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"systems": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|||||||
@@ -216,7 +216,7 @@ let
|
|||||||
|
|
||||||
healthChecks = lib.mkOption {
|
healthChecks = lib.mkOption {
|
||||||
type = lib.types.bool;
|
type = lib.types.bool;
|
||||||
default = true;
|
default = false;
|
||||||
description = ''
|
description = ''
|
||||||
When enabled, the init service will verify connectivity after provisioning:
|
When enabled, the init service will verify connectivity after provisioning:
|
||||||
- Tests all download clients are reachable via the application's testall API
|
- Tests all download clients are reachable via the application's testall API
|
||||||
|
|||||||
@@ -42,9 +42,17 @@ def _dict_to_fields(d):
|
|||||||
|
|
||||||
|
|
||||||
def _needs_field_update(desired, current_fields):
|
def _needs_field_update(desired, current_fields):
|
||||||
"""Return True if any desired field value differs from the current state."""
|
"""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.
|
||||||
|
"""
|
||||||
current = _fields_to_dict(current_fields)
|
current = _fields_to_dict(current_fields)
|
||||||
return any(desired.get(k) != current.get(k) for k in desired)
|
return any(
|
||||||
|
desired.get(k) != current.get(k)
|
||||||
|
for k in desired
|
||||||
|
if current.get(k) != "********"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
# -- Download clients --------------------------------------------------------
|
# -- Download clients --------------------------------------------------------
|
||||||
|
|||||||
@@ -97,7 +97,6 @@ pkgs.testers.runNixOSTest {
|
|||||||
];
|
];
|
||||||
|
|
||||||
services.arrInit.sonarr = {
|
services.arrInit.sonarr = {
|
||||||
healthChecks = false;
|
|
||||||
enable = true;
|
enable = true;
|
||||||
serviceName = "mock-sonarr";
|
serviceName = "mock-sonarr";
|
||||||
dataDir = "/var/lib/mock-sonarr";
|
dataDir = "/var/lib/mock-sonarr";
|
||||||
|
|||||||
@@ -45,7 +45,6 @@ pkgs.testers.runNixOSTest {
|
|||||||
# Test 3: Path with spaces
|
# Test 3: Path with spaces
|
||||||
services.arrInit.sonarr = {
|
services.arrInit.sonarr = {
|
||||||
enable = true;
|
enable = true;
|
||||||
healthChecks = false;
|
|
||||||
serviceName = "sonarr";
|
serviceName = "sonarr";
|
||||||
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
||||||
port = 8989;
|
port = 8989;
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ pkgs.testers.runNixOSTest {
|
|||||||
# The dataDir points to a non-existent config.xml
|
# The dataDir points to a non-existent config.xml
|
||||||
services.arrInit.sonarr = {
|
services.arrInit.sonarr = {
|
||||||
enable = true;
|
enable = true;
|
||||||
healthChecks = false;
|
|
||||||
serviceName = "sonarr";
|
serviceName = "sonarr";
|
||||||
dataDir = "/var/lib/nonexistent";
|
dataDir = "/var/lib/nonexistent";
|
||||||
port = 8989;
|
port = 8989;
|
||||||
|
|||||||
@@ -61,7 +61,6 @@ pkgs.testers.runNixOSTest {
|
|||||||
|
|
||||||
services.arrInit.sonarr = {
|
services.arrInit.sonarr = {
|
||||||
enable = true;
|
enable = true;
|
||||||
healthChecks = false;
|
|
||||||
serviceName = "sonarr";
|
serviceName = "sonarr";
|
||||||
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
||||||
port = 8989;
|
port = 8989;
|
||||||
@@ -84,7 +83,6 @@ pkgs.testers.runNixOSTest {
|
|||||||
|
|
||||||
services.arrInit.radarr = {
|
services.arrInit.radarr = {
|
||||||
enable = true;
|
enable = true;
|
||||||
healthChecks = false;
|
|
||||||
serviceName = "radarr";
|
serviceName = "radarr";
|
||||||
dataDir = "/var/lib/radarr/.config/Radarr";
|
dataDir = "/var/lib/radarr/.config/Radarr";
|
||||||
port = 7878;
|
port = 7878;
|
||||||
@@ -107,7 +105,6 @@ pkgs.testers.runNixOSTest {
|
|||||||
|
|
||||||
services.arrInit.prowlarr = {
|
services.arrInit.prowlarr = {
|
||||||
enable = true;
|
enable = true;
|
||||||
healthChecks = false;
|
|
||||||
serviceName = "prowlarr";
|
serviceName = "prowlarr";
|
||||||
dataDir = "/var/lib/prowlarr";
|
dataDir = "/var/lib/prowlarr";
|
||||||
port = 9696;
|
port = 9696;
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ pkgs.testers.runNixOSTest {
|
|||||||
# Sonarr with TWO download clients: qBittorrent + SABnzbd
|
# Sonarr with TWO download clients: qBittorrent + SABnzbd
|
||||||
services.arrInit.sonarr = {
|
services.arrInit.sonarr = {
|
||||||
enable = true;
|
enable = true;
|
||||||
healthChecks = false;
|
|
||||||
serviceName = "sonarr";
|
serviceName = "sonarr";
|
||||||
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
||||||
port = 8989;
|
port = 8989;
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ pkgs.testers.runNixOSTest {
|
|||||||
serviceName = "sonarr";
|
serviceName = "sonarr";
|
||||||
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
||||||
port = 8989;
|
port = 8989;
|
||||||
healthChecks = false;
|
|
||||||
naming = {
|
naming = {
|
||||||
renameEpisodes = true;
|
renameEpisodes = true;
|
||||||
standardEpisodeFormat = "{Series Title} - S{season:00}E{episode:00} - {Episode Title} {Quality Full}";
|
standardEpisodeFormat = "{Series Title} - S{season:00}E{episode:00} - {Episode Title} {Quality Full}";
|
||||||
|
|||||||
@@ -90,7 +90,6 @@ pkgs.testers.runNixOSTest {
|
|||||||
serviceName = "mock-sonarr";
|
serviceName = "mock-sonarr";
|
||||||
dataDir = "/var/lib/mock-sonarr";
|
dataDir = "/var/lib/mock-sonarr";
|
||||||
port = 8989;
|
port = 8989;
|
||||||
healthChecks = false;
|
|
||||||
networkNamespacePath = "/run/netns/test-ns";
|
networkNamespacePath = "/run/netns/test-ns";
|
||||||
networkNamespaceService = "create-netns";
|
networkNamespaceService = "create-netns";
|
||||||
rootFolders = [ "/media/tv" ];
|
rootFolders = [ "/media/tv" ];
|
||||||
|
|||||||
@@ -50,7 +50,6 @@ pkgs.testers.runNixOSTest {
|
|||||||
# Test 1: Only rootFolders (no downloadClients)
|
# Test 1: Only rootFolders (no downloadClients)
|
||||||
services.arrInit.sonarr = {
|
services.arrInit.sonarr = {
|
||||||
enable = true;
|
enable = true;
|
||||||
healthChecks = false;
|
|
||||||
serviceName = "sonarr";
|
serviceName = "sonarr";
|
||||||
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
||||||
port = 8989;
|
port = 8989;
|
||||||
@@ -62,7 +61,6 @@ pkgs.testers.runNixOSTest {
|
|||||||
# Test 2: Only downloadClients (no rootFolders)
|
# Test 2: Only downloadClients (no rootFolders)
|
||||||
services.arrInit.radarr = {
|
services.arrInit.radarr = {
|
||||||
enable = true;
|
enable = true;
|
||||||
healthChecks = false;
|
|
||||||
serviceName = "radarr";
|
serviceName = "radarr";
|
||||||
dataDir = "/var/lib/radarr/.config/Radarr";
|
dataDir = "/var/lib/radarr/.config/Radarr";
|
||||||
port = 7878;
|
port = 7878;
|
||||||
@@ -87,7 +85,6 @@ pkgs.testers.runNixOSTest {
|
|||||||
# Test 3: Only syncedApps (Prowlarr)
|
# Test 3: Only syncedApps (Prowlarr)
|
||||||
services.arrInit.prowlarr = {
|
services.arrInit.prowlarr = {
|
||||||
enable = true;
|
enable = true;
|
||||||
healthChecks = false;
|
|
||||||
serviceName = "prowlarr";
|
serviceName = "prowlarr";
|
||||||
dataDir = "/var/lib/prowlarr";
|
dataDir = "/var/lib/prowlarr";
|
||||||
port = 9696;
|
port = 9696;
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ pkgs.testers.runNixOSTest {
|
|||||||
serviceName = "mock-sonarr";
|
serviceName = "mock-sonarr";
|
||||||
dataDir = "/var/lib/mock-sonarr";
|
dataDir = "/var/lib/mock-sonarr";
|
||||||
port = 8989;
|
port = 8989;
|
||||||
healthChecks = false;
|
|
||||||
# Very short timeout so retries happen fast
|
# Very short timeout so retries happen fast
|
||||||
apiTimeout = 3;
|
apiTimeout = 3;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user