diff options
| -rw-r--r-- | flake.lock | 60 | ||||
| -rwxr-xr-x | host/Rory-nginx/configuration.nix | 10 | ||||
| -rw-r--r-- | modules/monitoring/synapse.nix | 2 |
3 files changed, 44 insertions, 28 deletions
diff --git a/flake.lock b/flake.lock index 9280b63..4bdaa16 100644 --- a/flake.lock +++ b/flake.lock @@ -5,7 +5,7 @@ "crane": "crane", "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -28,7 +28,7 @@ "crane": "crane_3", "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -48,9 +48,7 @@ }, "botcore-v4": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1683656302, @@ -75,7 +73,7 @@ "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1724842781, @@ -417,7 +415,7 @@ "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_5", "nix-filter": "nix-filter_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "rust-manifest": "rust-manifest" }, "locked": { @@ -438,7 +436,7 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1725628988, @@ -524,7 +522,7 @@ "inputs": { "flake-compat": "flake-compat_5", "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1725358307, @@ -542,16 +540,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", - "owner": "NixOS", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -654,6 +652,22 @@ }, "nixpkgs_2": { "locked": { + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { "lastModified": 1709479366, "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", "owner": "NixOS", @@ -668,7 +682,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1711401922, "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", @@ -684,7 +698,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1716330097, "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", @@ -700,7 +714,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1725103162, "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", @@ -716,7 +730,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1725001927, "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", @@ -732,7 +746,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1725432240, "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", @@ -748,7 +762,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1725194671, "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", @@ -774,7 +788,7 @@ "mtxclientSrc": "mtxclientSrc", "nhekoSrc": "nhekoSrc", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-Draupnir": "nixpkgs-Draupnir", "nixpkgs-RoryNix": "nixpkgs-RoryNix", "nixpkgs-master": "nixpkgs-master", @@ -829,7 +843,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix index c875678..3f0bcc4 100755 --- a/host/Rory-nginx/configuration.nix +++ b/host/Rory-nginx/configuration.nix @@ -54,11 +54,11 @@ nameservers = lib.mkOverride [ "192.168.1.1" ]; }; - environment.etc."resolv.conf" = lib.mkOverride { - text = '' - nameserver 192.168.1.1 - ''; - }; +# environment.etc."resolv.conf" = lib.mkOverride { +# text = '' +# nameserver 192.168.1.1 +# ''; +# }; monitoring = { monitorAll = true; diff --git a/modules/monitoring/synapse.nix b/modules/monitoring/synapse.nix index b1b30b4..bd03ec9 100644 --- a/modules/monitoring/synapse.nix +++ b/modules/monitoring/synapse.nix @@ -13,6 +13,7 @@ in port = 9200; tls = false; resources = [ ]; + bind_addresses = [ "127.0.0.1" ]; } ]; @@ -26,6 +27,7 @@ in type = "metrics"; port = 9200 + index + 1; resources = [ ]; + bind_addresses = [ "127.0.0.1" ]; } ]; }; |