diff --git a/flake.lock b/flake.lock index 954eac3..474ac5b 100644 --- a/flake.lock +++ b/flake.lock @@ -206,11 +206,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1658982026, - "narHash": "sha256-P5SjpQsfmLWKqmFUewkYgW3vd7UW5gBtatw2ZYJ3+N4=", + "lastModified": 1659059370, + "narHash": "sha256-JrD97kjloTgkuHRCHbvTCFJLnRQTICYwbR4QzXk6nnU=", "owner": "jyooru", "repo": "nix-minecraft-servers", - "rev": "30a8e061a1cd578dae6f54172d6932dfb075e765", + "rev": "927bd0ae6473b431ccab8aff20eb04eb4323d627", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1658826464, - "narHash": "sha256-94ZTF0uIX/iZdiD4RJ5f933ak/OM4XLl7hF+gCa4Iuk=", + "lastModified": 1658985157, + "narHash": "sha256-f8JN0mQGSaEfw6HjMST0yViBTln/kzfTxe+qHutzvEI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ce49cb7792a7ffd65ef352dda1110a4e4a204eac", + "rev": "bba87fc2a33618d86233fbdddc6b84971e6b5558", "type": "github" }, "original": { diff --git a/hosts.nix b/hosts.nix index 63d9d40..3bc4bc3 100644 --- a/hosts.nix +++ b/hosts.nix @@ -99,6 +99,7 @@ hostname = "minecraft"; ip = "10.42.42.21"; mac = "EA:30:73:E4:B6:69"; + nix = false; } { hostname = "gitea"; diff --git a/nixos/hosts/nginx/configuration.nix b/nixos/hosts/nginx/configuration.nix index c11fa6a..0cd0c54 100644 --- a/nixos/hosts/nginx/configuration.nix +++ b/nixos/hosts/nginx/configuration.nix @@ -55,6 +55,7 @@ in virtualHosts."md.0x76.dev" = proxy "http://hedgedoc.olympus:3000/"; virtualHosts."git.0x76.dev" = proxy "http://gitea.olympus:3000"; virtualHosts."o.0x76.dev" = proxy "http://minio.olympus:9000"; + virtualHosts."grafana.0x76.dev" = proxy "http://victoriametrics.olympus:2342"; # Meow virtualHosts."meowy.tech" = { diff --git a/nixos/hosts/victoriametrics/configuration.nix b/nixos/hosts/victoriametrics/configuration.nix index 5fd0532..22350d2 100644 --- a/nixos/hosts/victoriametrics/configuration.nix +++ b/nixos/hosts/victoriametrics/configuration.nix @@ -37,7 +37,10 @@ in enable = true; openFirewall = true; prometheusConfig = { - global.scrape_interval = "5s"; + global = { + scrape_interval = "1m"; + scrape_timeout = "30s"; + }; scrape_configs = [ { job_name = "synapse"; @@ -60,6 +63,8 @@ in enable = true; addr = "0.0.0.0"; port = 2342; + domain = "grafana.0x76.dev"; + rootUrl = "https://grafana.0x76.dev"; security.adminPasswordFile = "${vs.grafana}/password"; }; } diff --git a/nixos/hosts/wireguard/configuration.nix b/nixos/hosts/wireguard/configuration.nix index 68c4554..b83c498 100644 --- a/nixos/hosts/wireguard/configuration.nix +++ b/nixos/hosts/wireguard/configuration.nix @@ -45,6 +45,11 @@ let vs = config.vault-secrets.secrets; in publicKey = "K+99mvSYs4urcclreQDLA1pekD4xtu/mpS2uVWw8Bws="; allowedIPs = [ "10.100.0.2/32" ]; } + { + # Laura's laptop + publicKey = "ZWIaDGrASlTkEK75j10VeGCvrIGfpk4GPobmqcYX2D0="; + allowedIPs = [ "10.100.0.3/32" ]; + } ]; }; }