use wantedBy for root service deps

aksiksi · Nov 15, 2023 · b1801e8 · b1801e8
1 parent 4e4c4c4
commit b1801e8
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 71 deletions.
diff --git a/templates/container.nix.tmpl b/templates/container.nix.tmpl
@@ -107,6 +107,8 @@ systemd.services."{{.Runtime}}-{{.Name}}" = {
   startLimitIntervalSec = {{derefInt .SystemdConfig.StartLimitIntervalSec}};
   {{- end}}
   {{- if rootTarget}}
+  {{- /* PartOf for stop/restart of root, WantedBy for start of root. */}}
   partOf = [ "{{rootTarget}}.target" ];
+  wantedBy = [ "{{rootTarget}}.target" ];
   {{- end}}
 };
diff --git a/templates/main.nix.tmpl b/templates/main.nix.tmpl
@@ -54,11 +54,6 @@
     unitConfig = {
       Description = "Root target generated by compose2nix.";
     };
-    wants = [
-      {{- range $units}}
-      "{{.}}"
-      {{- end}}
-    ];
     {{- if .AutoStart}}
     wantedBy = [ "multi-user.target" ];
     {{- end}}

diff --git a/templates/network.nix.tmpl b/templates/network.nix.tmpl
@@ -28,6 +28,8 @@ systemd.services."{{.Runtime}}-network-{{.Name}}" = {
   ];
   {{- end}}
   {{- if rootTarget}}
+  {{- /* PartOf for stop/restart of root, WantedBy for start of root. */}}
   partOf = [ "{{rootTarget}}.target" ];
+  wantedBy = [ "{{rootTarget}}.target" ];
   {{- end}}
 };
diff --git a/templates/volume.nix.tmpl b/templates/volume.nix.tmpl
@@ -29,6 +29,8 @@ systemd.services."{{.Runtime}}-volume-{{.Name}}" = {
   ];
   {{- end}}
   {{- if rootTarget}}
+  {{- /* PartOf for stop/restart of root, WantedBy for start of root. */}}
   partOf = [ "{{rootTarget}}.target" ];
+  wantedBy = [ "{{rootTarget}}.target" ];
   {{- end}}
 };
diff --git a/testdata/TestDocker_RemoveVolumes_out.nix b/testdata/TestDocker_RemoveVolumes_out.nix
@@ -48,6 +48,7 @@
     startLimitBurst = 3;
     startLimitIntervalSec = 120;
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   virtualisation.oci-containers.containers."myproject-sabnzbd" = {
     image = "lscr.io/linuxserver/sabnzbd";
@@ -89,6 +90,7 @@
       Description = "This is the sabnzbd container!";
     };
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   virtualisation.oci-containers.containers."photoprism-mariadb" = {
     image = "docker.io/library/mariadb:10.9";
@@ -123,6 +125,7 @@
     startLimitBurst = 10;
     startLimitIntervalSec = 86400;
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   virtualisation.oci-containers.containers."torrent-client" = {
     image = "docker.io/haugene/transmission-openvpn";
@@ -183,6 +186,7 @@
     startLimitBurst = 3;
     startLimitIntervalSec = 86400;
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   virtualisation.oci-containers.containers."traefik" = {
     image = "docker.io/library/traefik";
@@ -227,6 +231,7 @@
       AllowIsolate = true;
     };
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
 
   # Networks
@@ -247,6 +252,7 @@
       "docker-myproject-sabnzbd.service"
     ];
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   systemd.services."docker-network-myproject-something" = {
     path = [ pkgs.docker ];
@@ -265,6 +271,7 @@
       "docker-torrent-client.service"
     ];
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
 
   # Volumes
@@ -285,6 +292,7 @@
       "docker-jellyseerr.service"
     ];
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   systemd.services."docker-volume-photos" = {
     path = [ pkgs.docker ];
@@ -303,6 +311,7 @@
       "docker-photoprism-mariadb.service"
     ];
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   systemd.services."docker-volume-storage" = {
     path = [ pkgs.docker ];
@@ -323,6 +332,7 @@
       "docker-torrent-client.service"
     ];
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
 
   # Root service
@@ -332,17 +342,5 @@
     unitConfig = {
       Description = "Root target generated by compose2nix.";
     };
-    wants = [
-      "docker-jellyseerr.service"
-      "docker-myproject-sabnzbd.service"
-      "docker-photoprism-mariadb.service"
-      "docker-torrent-client.service"
-      "docker-traefik.service"
-      "docker-network-myproject-default.service"
-      "docker-network-myproject-something.service"
-      "docker-volume-books.service"
-      "docker-volume-photos.service"
-      "docker-volume-storage.service"
-    ];
   };
 }
diff --git a/testdata/TestDocker_SystemdMount_out.nix b/testdata/TestDocker_SystemdMount_out.nix
@@ -54,6 +54,7 @@
     startLimitBurst = 3;
     startLimitIntervalSec = 120;
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   virtualisation.oci-containers.containers."myproject-sabnzbd" = {
     image = "lscr.io/linuxserver/sabnzbd";
@@ -101,6 +102,7 @@
       "mnt-media.mount"
     ];
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   virtualisation.oci-containers.containers."photoprism-mariadb" = {
     image = "docker.io/library/mariadb:10.9";
@@ -141,6 +143,7 @@
     startLimitBurst = 10;
     startLimitIntervalSec = 86400;
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   virtualisation.oci-containers.containers."torrent-client" = {
     image = "docker.io/haugene/transmission-openvpn";
@@ -207,6 +210,7 @@
     startLimitBurst = 3;
     startLimitIntervalSec = 86400;
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   virtualisation.oci-containers.containers."traefik" = {
     image = "docker.io/library/traefik";
@@ -251,6 +255,7 @@
       AllowIsolate = true;
     };
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
 
   # Networks
@@ -271,6 +276,7 @@
       "docker-myproject-sabnzbd.service"
     ];
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   systemd.services."docker-network-myproject-something" = {
     path = [ pkgs.docker ];
@@ -289,6 +295,7 @@
       "docker-torrent-client.service"
     ];
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
 
   # Volumes
@@ -308,6 +315,7 @@
       "docker-jellyseerr.service"
     ];
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   systemd.services."docker-volume-photos" = {
     path = [ pkgs.docker ];
@@ -325,6 +333,7 @@
       "docker-photoprism-mariadb.service"
     ];
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   systemd.services."docker-volume-storage" = {
     path = [ pkgs.docker ];
@@ -344,6 +353,7 @@
       "docker-torrent-client.service"
     ];
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
 
   # Root service
@@ -353,17 +363,5 @@
     unitConfig = {
       Description = "Root target generated by compose2nix.";
     };
-    wants = [
-      "docker-jellyseerr.service"
-      "docker-myproject-sabnzbd.service"
-      "docker-photoprism-mariadb.service"
-      "docker-torrent-client.service"
-      "docker-traefik.service"
-      "docker-network-myproject-default.service"
-      "docker-network-myproject-something.service"
-      "docker-volume-books.service"
-      "docker-volume-photos.service"
-      "docker-volume-storage.service"
-    ];
   };
 }
diff --git a/testdata/TestDocker_WithProject_out.nix b/testdata/TestDocker_WithProject_out.nix
@@ -48,6 +48,7 @@
     startLimitBurst = 3;
     startLimitIntervalSec = 120;
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   virtualisation.oci-containers.containers."myproject-sabnzbd" = {
     image = "lscr.io/linuxserver/sabnzbd";
@@ -89,6 +90,7 @@
       Description = "This is the sabnzbd container!";
     };
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   virtualisation.oci-containers.containers."photoprism-mariadb" = {
     image = "docker.io/library/mariadb:10.9";
@@ -123,6 +125,7 @@
     startLimitBurst = 10;
     startLimitIntervalSec = 86400;
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   virtualisation.oci-containers.containers."torrent-client" = {
     image = "docker.io/haugene/transmission-openvpn";
@@ -183,6 +186,7 @@
     startLimitBurst = 3;
     startLimitIntervalSec = 86400;
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   virtualisation.oci-containers.containers."traefik" = {
     image = "docker.io/library/traefik";
@@ -227,6 +231,7 @@
       AllowIsolate = true;
     };
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
 
   # Networks
@@ -247,6 +252,7 @@
       "docker-myproject-sabnzbd.service"
     ];
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   systemd.services."docker-network-myproject-something" = {
     path = [ pkgs.docker ];
@@ -265,6 +271,7 @@
       "docker-torrent-client.service"
     ];
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
 
   # Volumes
@@ -284,6 +291,7 @@
       "docker-jellyseerr.service"
     ];
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   systemd.services."docker-volume-photos" = {
     path = [ pkgs.docker ];
@@ -301,6 +309,7 @@
       "docker-photoprism-mariadb.service"
     ];
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
   systemd.services."docker-volume-storage" = {
     path = [ pkgs.docker ];
@@ -320,6 +329,7 @@
       "docker-torrent-client.service"
     ];
     partOf = [ "docker-compose-myproject-root.target" ];
+    wantedBy = [ "docker-compose-myproject-root.target" ];
   };
 
   # Root service
@@ -329,17 +339,5 @@
     unitConfig = {
       Description = "Root target generated by compose2nix.";
     };
-    wants = [
-      "docker-jellyseerr.service"
-      "docker-myproject-sabnzbd.service"
-      "docker-photoprism-mariadb.service"
-      "docker-torrent-client.service"
-      "docker-traefik.service"
-      "docker-network-myproject-default.service"
-      "docker-network-myproject-something.service"
-      "docker-volume-books.service"
-      "docker-volume-photos.service"
-      "docker-volume-storage.service"
-    ];
   };
 }