Skip to content

Commit c440c46

Browse files
committed
fix config timing, move wait for api to post config
1 parent e6c2ef0 commit c440c46

5 files changed

Lines changed: 1 addition & 8 deletions

File tree

modules/arr-common/downloadClients.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
serviceName,
55
}:
66
with lib; let
7-
mkWaitForApiScript = import ./mkWaitForApiScript.nix {inherit lib pkgs;};
87
capitalizedName = lib.toUpper (builtins.substring 0 1 serviceName) + builtins.substring 1 (-1) serviceName;
98
in {
109
options = mkOption {
@@ -61,7 +60,6 @@ in {
6160
serviceConfig = {
6261
Type = "oneshot";
6362
RemainAfterExit = true;
64-
ExecStartPre = mkWaitForApiScript serviceName serviceConfig;
6563
};
6664

6765
script = ''

modules/arr-common/hostConfig.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ in {
2222
Type = "oneshot";
2323
RemainAfterExit = true;
2424
ExecStartPre = mkWaitForApiScript serviceName serviceConfig;
25+
ExecStartPost = mkWaitForApiScript serviceName serviceConfig;
2526
};
2627

2728
script = ''

modules/arr-common/rootFolders.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
serviceName,
55
}:
66
with lib; let
7-
mkWaitForApiScript = import ./mkWaitForApiScript.nix {inherit lib pkgs;};
87
capitalizedName = lib.toUpper (builtins.substring 0 1 serviceName) + builtins.substring 1 (-1) serviceName;
98
in {
109
options = mkOption {
@@ -28,7 +27,6 @@ in {
2827
serviceConfig = {
2928
Type = "oneshot";
3029
RemainAfterExit = true;
31-
ExecStartPre = mkWaitForApiScript serviceName serviceConfig;
3230
};
3331

3432
script = ''

modules/prowlarr/applications.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
serviceName,
55
}:
66
with lib; let
7-
mkWaitForApiScript = import ../arr-common/mkWaitForApiScript.nix {inherit lib pkgs;};
87
capitalizedName = lib.toUpper (builtins.substring 0 1 serviceName) + builtins.substring 1 (-1) serviceName;
98
in {
109
type = mkOption {
@@ -47,7 +46,6 @@ in {
4746
serviceConfig = {
4847
Type = "oneshot";
4948
RemainAfterExit = true;
50-
ExecStartPre = mkWaitForApiScript serviceName serviceConfig;
5149
};
5250

5351
script = ''

modules/prowlarr/indexers.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
serviceName,
55
}:
66
with lib; let
7-
mkWaitForApiScript = import ../arr-common/mkWaitForApiScript.nix {inherit lib pkgs;};
87
capitalizedName = lib.toUpper (builtins.substring 0 1 serviceName) + builtins.substring 1 (-1) serviceName;
98
in {
109
type = mkOption {
@@ -42,7 +41,6 @@ in {
4241
serviceConfig = {
4342
Type = "oneshot";
4443
RemainAfterExit = true;
45-
ExecStartPre = mkWaitForApiScript serviceName serviceConfig;
4644
};
4745

4846
script = ''

0 commit comments

Comments
 (0)