diff --git a/flake.lock b/flake.lock index d7d8f9a7..171f32ed 100644 --- a/flake.lock +++ b/flake.lock @@ -503,10 +503,10 @@ "mysecrets": { "flake": false, "locked": { - "lastModified": 1789875389, - "narHash": "sha256-aHBxNh96dBsOzKqNcLdo4H4XzE0IAD1KVFXMNdV3W+s=", + "lastModified": 1789975872, + "narHash": "sha256-DQrX1au7BWEzXJqR2FBiSYdF0DWd5NMh12y6ovtn41o=", "ref": "refs/heads/main", - "rev": "8cd11a98a258410e3af03a2bf3bfeff2201fa5f8", + "rev": "4def15deec5c0538df16ad2d49028298ee81d7ab", "shallow": true, "type": "git", "url": "ssh://git@github.com/ryan4yin/nix-secrets.git" diff --git a/hosts/k8s/kubevirt-youko/aquamarine-services.nix b/hosts/k8s/kubevirt-youko/aquamarine-services.nix new file mode 100644 index 00000000..5869076a --- /dev/null +++ b/hosts/k8s/kubevirt-youko/aquamarine-services.nix @@ -0,0 +1,36 @@ +{ + mylib, + ... +}: +{ + # aquamarine's services now run directly on this host, migrated off the + # KubeVirt VM. Its HDD disko config only defines the two data disks (no root + # disk), so it can be imported here as-is -- disko's NixOS module only + # generates the fileSystems/mounts, it never reformats. + imports = map mylib.relativeToRoot [ + "hosts/idols-aquamarine/caddy.nix" + "hosts/idols-aquamarine/disko-fs.nix" + "hosts/idols-aquamarine/exporters" + "hosts/idols-aquamarine/gitea.nix" + "hosts/idols-aquamarine/grafana" + "hosts/idols-aquamarine/monitoring" + "hosts/idols-aquamarine/oci-containers" + "hosts/idols-aquamarine/postgresql.nix" + "hosts/idols-aquamarine/proxy.nix" + "hosts/idols-aquamarine/restic.nix" + "hosts/idols-aquamarine/sftpgo.nix" + "hosts/idols-aquamarine/transmission.nix" + ]; + + # keep aquamarine's IP on this host's bridge so its services and DNS keep + # resolving after the migration (the NixOS list option merges with the .183) + systemd.network.networks."10-br0".networkConfig.Address = [ "192.168.5.101/24" ]; + + # the same secret groups the aqua VM enabled + modules.secrets.server = { + application.enable = true; + operation.enable = true; + webserver.enable = true; + storage.enable = true; + }; +}