diff --git a/nixos/hosts/hades/bastion/configuration.nix b/nixos/hosts/hades/bastion/configuration.nix index eaac5fe..a2a6cd0 100644 --- a/nixos/hosts/hades/bastion/configuration.nix +++ b/nixos/hosts/hades/bastion/configuration.nix @@ -20,7 +20,7 @@ environment.noXlibs = lib.mkForce false; - system.stateVersion = "21.05"; + system.stateVersion = "22.11"; programs.gnupg.agent = { enable = true; diff --git a/nixos/hosts/hades/prowlarr/configuration.nix b/nixos/hosts/hades/prowlarr/configuration.nix index da0eff8..3dfad83 100644 --- a/nixos/hosts/hades/prowlarr/configuration.nix +++ b/nixos/hosts/hades/prowlarr/configuration.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { networking.interfaces.eth0.useDHCP = true; - system.stateVersion = "21.05"; + system.stateVersion = "22.11"; services.prowlarr = { enable = true; diff --git a/nixos/hosts/olympus/victoriametrics/configuration.nix b/nixos/hosts/olympus/victoriametrics/configuration.nix index 67be6ca..40a6715 100644 --- a/nixos/hosts/olympus/victoriametrics/configuration.nix +++ b/nixos/hosts/olympus/victoriametrics/configuration.nix @@ -21,7 +21,7 @@ in # Additional packages environment.systemPackages = with pkgs; [ ]; - networking.firewall.allowedTCPPorts = [ vmPort config.services.grafana.port ]; + networking.firewall.allowedTCPPorts = [ vmPort config.services.grafana.settings.server.http_port ]; networking.firewall.allowedUDPPorts = [ vmPort ]; services.victoriametrics = { @@ -75,10 +75,14 @@ in services.grafana = { enable = true; - addr = "0.0.0.0"; - port = 2342; - domain = "grafana.0x76.dev"; - rootUrl = "https://grafana.0x76.dev"; - settings.security.admin_password = "$__file{${vs.grafana}/password}"; + settings = { + server = { + domain = "grafana.0x76.dev"; + root_url = "https://grafana.0x76.dev"; + http_addr = "0.0.0.0"; + http_port = 2342; + }; + security.admin_password = "$__file{${vs.grafana}/password}"; + }; }; }