diff --git a/machines/calcite/configuration.nix b/machines/calcite/configuration.nix index 4b35351..d42c585 100644 --- a/machines/calcite/configuration.nix +++ b/machines/calcite/configuration.nix @@ -208,7 +208,6 @@ element-desktop tdesktop qq - feishu # Password manager bitwarden @@ -265,6 +264,11 @@ custom.forgejo-actions-runner.enable = true; custom.forgejo-actions-runner.tokenFile = config.sops.secrets.gitea_env.path; + custom.prometheus = { + enable = true; + exporters.enable = true; + }; + # MTP support services.gvfs.enable = true; diff --git a/machines/dolomite/default.nix b/machines/dolomite/default.nix index 3195b58..5bf2979 100644 --- a/machines/dolomite/default.nix +++ b/machines/dolomite/default.nix @@ -49,6 +49,8 @@ in networking.firewall.allowedTCPPorts = [ 80 8080 ]; networking.firewall.allowedUDPPorts = [ ] ++ (lib.range 6311 6314); + services.tailscale.enable = true; + custom.prometheus = { enable = false; exporters.enable = false; diff --git a/machines/massicot/default.nix b/machines/massicot/default.nix index 7656e12..5ac8151 100644 --- a/machines/massicot/default.nix +++ b/machines/massicot/default.nix @@ -8,7 +8,7 @@ ./services.nix ]; - customSettings = { + commonSettings = { auth.enable = true; nix.enable = true; }; diff --git a/modules/nixos/prometheus.nix b/modules/nixos/prometheus.nix index 40035f3..3e59480 100644 --- a/modules/nixos/prometheus.nix +++ b/modules/nixos/prometheus.nix @@ -103,7 +103,7 @@ in name = "ntfy"; webhook_configs = [ { - url = "${config.services.ntfy-sh.settings.base-url}/prometheus-alerts"; + url = "https://ntfy.xinyang.life/prometheus-alerts"; send_resolved = true; } ];