diff --git a/hosts/server10/microvm-staging.nix b/hosts/server10/microvm-staging.nix index 415989c0..a5cf33bc 100644 --- a/hosts/server10/microvm-staging.nix +++ b/hosts/server10/microvm-staging.nix @@ -38,28 +38,6 @@ in microvm.autostart = builtins.attrNames microvms; systemd.services = { - "staging-dh-create-data" = { - description = "Create ZFS datasets for staging-data-hoarder shares"; - requiredBy = [ - "microvm@staging-data-hoarder.service" - ]; - before = [ - "microvm@staging-data-hoarder.service" - ]; - after = [ - "microvm-create@staging-data-hoarder.service" - ]; - serviceConfig = { - Type = "oneshot"; - }; - path = [ pkgs.zfs ]; - script = '' - cd /var/lib/microvms/staging-data-hoarder - for MNT in etc var ; do - [ -d $MNT ] || zfs create -o mountpoint=`pwd`/$MNT ${config.networking.hostName}/vm/staging-data-hoarder/$MNT - done - ''; - }; "microvm-update@" = { description = "Update MicroVMs automatically"; diff --git a/hosts/server10/microvms.nix b/hosts/server10/microvms.nix index 08b7efc5..f6c0bc52 100644 --- a/hosts/server10/microvms.nix +++ b/hosts/server10/microvms.nix @@ -10,7 +10,10 @@ config = { microvm.autostart = # static list of microvms from other sources - [ "staging-data-hoarder" ] + [ + "data-hoarder" + "staging-data-hoarder" + ] ++ # just all the microvms from this flake # that are supposed to run on the server @@ -22,6 +25,12 @@ == config.networking.hostName ) (builtins.attrNames self.nixosConfigurations); + c3d2.server.bridgePorts = { + serv = [ + "data-hoarder" + ]; + }; + systemd.services."microvm-virtiofsd@" = { requires = [ "microvm-zfs-datasets@%i.service" ]; };