[WIP] feat: migrate containers to vmd102066

nix/os/containers/backup-target.nix

@@ -1,7 +1,7 @@
 { hostAddress, localAddress, containerBackupCfg
-, sshPort ? containerBackupCfg.portInt }: {
+, sshPort ? containerBackupCfg.portInt, autoStart ? false }: {
   config = { config, pkgs, lib, ... }: {
-    system.stateVersion = "21.11"; # Did you read the comment?
+    system.stateVersion = "22.05"; # Did you read the comment?
 
     imports = [ ../profiles/containers/configuration.nix ];
 
@@ -50,7 +50,7 @@
     };
   };
 
-  autoStart = true;
+  inherit autoStart;
 
   bindMounts = {
     "/${containerBackupCfg.targetPath}" = {
@@ -59,6 +59,8 @@
     };
   };
 
+  extraFlags = [ "--resolv-conf=bind-host" ];
+
   privateNetwork = true;
   forwardPorts = [{
     # ssh

nix/os/containers/backup.nix

@@ -1,9 +1,5 @@
-<<<<<<< HEAD
-{ config, hostAddress, localAddress, subvolumes, targetPathSuffix ? "" }:
-=======
 { config, hostAddress, localAddress, subvolumes, targetPathSuffix ? ""
 , autoStart ? false }:
->>>>>>> 82ff04b (chore: nixfmt *)
 
 let
   passwords = import ../../variables/passwords.crypt.nix;
@@ -89,7 +85,7 @@ in {
     };
   };
 
-  autoStart = true;
+  inherit autoStart;
 
   bindMounts = {
     "${subvolumeParentDir}" = {
@@ -113,11 +109,8 @@ in {
     modifier = "rw";
   }];
 
-<<<<<<< HEAD
-=======
   extraFlags = [ "--resolv-conf=bind-host" ];
 
->>>>>>> 82ff04b (chore: nixfmt *)
   privateNetwork = true;
   forwardPorts = [ ];
 

nix/os/containers/mailserver.nix

@@ -1,4 +1,5 @@
-{ hostAddress, localAddress, imapsPort ? 993, sievePort ? 4190 }:
+{ hostAddress, localAddress, imapsPort ? 993, sievePort ? 4190
+, autoStart ? false }:
 
 let passwords = import ../../variables/passwords.crypt.nix;
 
@@ -124,7 +125,7 @@ in {
     };
   };
 
-  autoStart = true;
+  inherit autoStart;
 
   bindMounts = {
     "/etc/secrets/" = {
@@ -138,6 +139,8 @@ in {
     };
   };
 
+  extraFlags = [ "--resolv-conf=bind-host" ];
+
   privateNetwork = true;
   forwardPorts = [
     {

nix/os/containers/syncthing.nix

@@ -1,5 +1,5 @@
 { hostAddress, localAddress, syncthingPort ? 22000
-, syncthingLocalAnnouncePort ? 21027 }:
+, syncthingLocalAnnouncePort ? 21027, autoStart ? false }:
 
 {
 
@@ -21,7 +21,7 @@
     };
   };
 
-  autoStart = true;
+  inherit autoStart;
 
   bindMounts = {
     "/var/lib/syncthing/" = {
@@ -30,6 +30,8 @@
     };
   };
 
+  extraFlags = [ "--resolv-conf=bind-host" ];
+
   privateNetwork = true;
   forwardPorts = [
     {

nix/os/containers/webserver.nix

@@ -1,4 +1,5 @@
-{ hostAddress, localAddress, httpPort ? 80, httpsPort ? 443 }:
+{ hostAddress, localAddress, httpPort ? 80, httpsPort ? 443, autoStart ? false
+}:
 
 let passwords = import ../../variables/passwords.crypt.nix;
 in {
@@ -121,7 +122,7 @@ in {
     };
   };
 
-  autoStart = true;
+  inherit autoStart;
 
   bindMounts = {
     "/etc/secrets/" = {
@@ -145,6 +146,8 @@ in {
     };
   };
 
+  extraFlags = [ "--resolv-conf=bind-host" ];
+
   privateNetwork = true;
   forwardPorts = [
     {