Compare commits

..

3 Commits

2 changed files with 5 additions and 29 deletions

View File

@@ -456,10 +456,7 @@ in
name: inst: name: inst:
lib.nameValuePair "${inst.serviceName}-init" { lib.nameValuePair "${inst.serviceName}-init" {
description = "Initialize ${name} API connections"; description = "Initialize ${name} API connections";
after = [ after = [ "${inst.serviceName}.service" ] ++ (getSyncedAppDeps inst)
"${inst.serviceName}.service"
]
++ (getSyncedAppDeps inst)
++ (lib.optional (inst.networkNamespacePath != null) "wg.service"); ++ (lib.optional (inst.networkNamespacePath != null) "wg.service");
requires = [ "${inst.serviceName}.service" ]; requires = [ "${inst.serviceName}.service" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@@ -467,8 +464,7 @@ in
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;
ExecStart = "${mkInitScript name inst}"; ExecStart = "${mkInitScript name inst}";
} } // lib.optionalAttrs (inst.networkNamespacePath != null) {
// lib.optionalAttrs (inst.networkNamespacePath != null) {
NetworkNamespacePath = inst.networkNamespacePath; NetworkNamespacePath = inst.networkNamespacePath;
}; };
} }

View File

@@ -182,16 +182,7 @@ testPkgs.testers.runNixOSTest {
prowlarrUrl = "http://localhost:9696"; prowlarrUrl = "http://localhost:9696";
baseUrl = "http://localhost:8989"; baseUrl = "http://localhost:8989";
apiKeyFrom = "/var/lib/sonarr/.config/NzbDrone/config.xml"; apiKeyFrom = "/var/lib/sonarr/.config/NzbDrone/config.xml";
syncCategories = [ syncCategories = [ 5000 5010 5020 5030 5040 5045 5050 5090 ];
5000
5010
5020
5030
5040
5045
5050
5090
];
serviceName = "sonarr"; serviceName = "sonarr";
} }
{ {
@@ -201,18 +192,7 @@ testPkgs.testers.runNixOSTest {
prowlarrUrl = "http://localhost:9696"; prowlarrUrl = "http://localhost:9696";
baseUrl = "http://localhost:7878"; baseUrl = "http://localhost:7878";
apiKeyFrom = "/var/lib/radarr/.config/Radarr/config.xml"; apiKeyFrom = "/var/lib/radarr/.config/Radarr/config.xml";
syncCategories = [ syncCategories = [ 2000 2010 2020 2030 2040 2045 2050 2060 2070 2080 ];
2000
2010
2020
2030
2040
2045
2050
2060
2070
2080
];
serviceName = "radarr"; serviceName = "radarr";
} }
]; ];