summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2022-12-19 14:17:18 +0100
committertv <tv@krebsco.de>2022-12-19 14:17:18 +0100
commit1081102c427ceb9677925035e3b449a1f986d293 (patch)
tree136e42953b9e7eb1b3a6fe270267f5fb663fbb7f /krebs
parent68e845da879f2064886794da330b652d60a47796 (diff)
parent37e2e08a0ad47985de277a01d392a11fbe2242f0 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/krebs-pages.nix1
-rw-r--r--krebs/nixpkgs.json8
2 files changed, 5 insertions, 4 deletions
diff --git a/krebs/3modules/krebs-pages.nix b/krebs/3modules/krebs-pages.nix
index c2df65ff5..6dd046a8b 100644
--- a/krebs/3modules/krebs-pages.nix
+++ b/krebs/3modules/krebs-pages.nix
@@ -38,6 +38,7 @@ in {
enable = lib.mkDefault true;
virtualHosts.${cfg.domain} = lib.mkMerge [ cfg.nginx {
root = lib.mkForce cfg.package;
+ locations."= /ip".return = "200 $remote_addr";
locations."= /redirect".return = "301 /redirect";
}];
};
diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index fe44c172d..17bffe634 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/NixOS/nixpkgs",
- "rev": "e8ec26f41fd94805d8fbf2552d8e7a449612c08e",
- "date": "2022-12-09T22:31:53+00:00",
- "path": "/nix/store/k2c06zy4vq019bb766rqnfszzx4q74zc-nixpkgs",
- "sha256": "05jsnhb3a72m733qr7dvva71kark5268l77lrvmlylzwaqzq4yyx",
+ "rev": "9d692a724e74d2a49f7c985132972f991d144254",
+ "date": "2022-12-16T13:36:40-05:00",
+ "path": "/nix/store/76wc0ymx7rw348hpl0bp0yb77sf40xd6-nixpkgs",
+ "sha256": "1byh49p3kwi6adb1izaalj2ab9disfzq1cx526gwgv20ilmphvnr",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,