From fe481df5d2f55e217079dd72dc64a7cae7fbbd1c Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 10 Nov 2025 00:08:45 +0000 Subject: [PATCH] Revert "prep for distrust-mini" This reverts commit b2c36ea08b618f2537fa6eb78907b1444995fb95. --- flake.nix | 2 +- services/distrust-mini/uptime-kuma.nix | 33 +++++++++++++++----------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index 81e2c21..b361699 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ }; distrust-mini = lib.nixosSystem { system = "x86_64-linux"; - modules = [./system/distrust-mini ./services/distrust-mini agenix.nixosModules.default {networking.hostName = "distrust-mini";}]; + modules = [./system/distrust-mini ./services/distrust-mini ./helpers/services.nix agenix.nixosModules.default {networking.hostName = "distrust-mini";}]; }; }; }; diff --git a/services/distrust-mini/uptime-kuma.nix b/services/distrust-mini/uptime-kuma.nix index 47866a2..eb6f149 100644 --- a/services/distrust-mini/uptime-kuma.nix +++ b/services/distrust-mini/uptime-kuma.nix @@ -3,22 +3,27 @@ in { age.secrets."hidden_service/uptime-kuma".file = ../../secrets/hidden_service/uptime-kuma; - services = { - uptime-kuma = { - enable = true; - settings = { - PORT = toString kumaPort; - }; + services.uptime-kuma = { + enable = true; + settings = { + PORT = toString kumaPort; }; - caddy = { - enable = true; - virtualHosts."https://status.distrust.network".extraConfig = '' - reverse_proxy localhost:${toString kumaPort} - ''; - }; - tor.relay.onionServices."uptime-kuma" = { - map = [80]; + }; + + distrust.services."uptime-kuma" = { + url = "https://status.distrust.network"; + onion = { + url = "http://dstrst6d56jb7y7bmd77fcq73x43e6euphf74qzjvvn43j67ugydd2id.onion"; secretKey = config.age.secrets."hidden_service/uptime-kuma".path; }; + virtualHostConfig = '' + reverse_proxy localhost:${toString kumaPort} + ''; + backup = { + enable = true; + paths = [ + "/var/lib/uptime-kuma" + ]; + }; }; }