From cb12be2f0fe045edc28a08e5354dc94f59841dce Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 20 Jun 2022 00:15:34 +0200 Subject: [PATCH] jabber: microvmify --- flake.nix | 2 +- hosts/containers/jabber/default.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 69eac22f..e32bf9af 100644 --- a/flake.nix +++ b/flake.nix @@ -605,7 +605,7 @@ jabber = nixosSystem' { modules = [ { nixpkgs.overlays = with secrets.overlays; [ jabber ]; } - ./config/lxc-container.nix + self.nixosModules.microvm ./hosts/containers/jabber ]; }; diff --git a/hosts/containers/jabber/default.nix b/hosts/containers/jabber/default.nix index 761729fa..5ad26a50 100644 --- a/hosts/containers/jabber/default.nix +++ b/hosts/containers/jabber/default.nix @@ -18,14 +18,10 @@ let ''; in { + microvm.mem = 2048; + networking = { hostName = "jabber"; - useNetworkd = true; - interfaces.eth0.ipv4.addresses = [{ - address = config.c3d2.hosts."${config.networking.hostName}".ip4; - prefixLength = zentralwerk.lib.config.site.net.serv.subnet4Len; - }]; - defaultGateway = "172.20.73.1"; firewall.allowedTCPPorts = [ # Prosody 5222 5223 5269 @@ -43,6 +39,10 @@ in c3d2 = { isInHq = false; hq.statistics.enable = true; + deployment = { + server = "server10"; + mounts = [ "etc" "home" "var"]; + }; }; services.collectd.plugins.exec = '' Exec "${config.services.collectd.user}" "${pkgs.ruby}/bin/ruby" "${./prosody-stats.rb}" @@ -207,7 +207,7 @@ in realm = "turn.${domain}"; lt-cred-mech = true; extraConfig = '' - external-ip=${publicIPv4}/${(builtins.head config.networking.interfaces.eth0.ipv4.addresses).address} + external-ip=${publicIPv4}/${zentralwerk.lib.config.site.net.serv.hosts4.jabber} user=${coturnUser}:${coturnPassword} '';