From 7182ca7cd40dffcaccd83e5319a5c496e05dd1c8 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Fri, 11 Apr 2025 21:45:46 -0400 Subject: [PATCH] make vmagent and sshd default for linux hosts --- .../nmasur/presets/services/metrics/victoriametrics.nix | 3 +++ platforms/nixos/modules/nmasur/profiles/base.nix | 2 ++ platforms/nixos/modules/nmasur/profiles/nas.nix | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/platforms/nixos/modules/nmasur/presets/services/metrics/victoriametrics.nix b/platforms/nixos/modules/nmasur/presets/services/metrics/victoriametrics.nix index e42cf59..721d1ce 100644 --- a/platforms/nixos/modules/nmasur/presets/services/metrics/victoriametrics.nix +++ b/platforms/nixos/modules/nmasur/presets/services/metrics/victoriametrics.nix @@ -53,6 +53,9 @@ in ]; }; + # Don't enable vmagent because we already have victoriametrics running anyway + services.vmagent.enable = lib.mkForce false; + systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable { description = "VictoriaMetrics basic auth proxy"; after = [ "network.target" ]; diff --git a/platforms/nixos/modules/nmasur/profiles/base.nix b/platforms/nixos/modules/nmasur/profiles/base.nix index 46cf604..77d277c 100644 --- a/platforms/nixos/modules/nmasur/profiles/base.nix +++ b/platforms/nixos/modules/nmasur/profiles/base.nix @@ -23,7 +23,9 @@ in }; services = { nix.enable = lib.mkDefault true; + openssh.enable = lib.mkDefault true; prometheus-exporters.enable = lib.mkDefault true; + vm-agent.enable = lib.mkDefault true; }; }; diff --git a/platforms/nixos/modules/nmasur/profiles/nas.nix b/platforms/nixos/modules/nmasur/profiles/nas.nix index 7383e44..e86c9a7 100644 --- a/platforms/nixos/modules/nmasur/profiles/nas.nix +++ b/platforms/nixos/modules/nmasur/profiles/nas.nix @@ -36,7 +36,6 @@ in paperless.enable = lib.mkDefault true; postgresql.enable = lib.mkDefault true; samba.enable = lib.mkDefault true; - vm-agent.enable = lib.mkDefault true; }; };