diff --git a/modules/homepage/default.nix b/modules/homepage/default.nix index 208368d..8b0c1e6 100644 --- a/modules/homepage/default.nix +++ b/modules/homepage/default.nix @@ -15,7 +15,6 @@ in enableACME = true; forceSSL = true; root = inputs.homepage; - default = true; }; services.nginx.virtualHosts."www.julienmalka.me" = { diff --git a/modules/status/checks.csv b/modules/status/checks.csv index 9ee2e4f..46beb17 100644 --- a/modules/status/checks.csv +++ b/modules/status/checks.csv @@ -1,4 +1,10 @@ -http, 200, Homepage, https://julienmalka.me -http, 200, CI, https://ci.julienmalka.me -ping, 0, Newton, newton.julienmalka.me - +http, 200, Lisa, https://google.com +http, 200, Homepage, https://julienmalka.me +http, 200, CI, https://ci.julienmalka.me +http, 200, Jellyfin, https://tv.julienmalka.me +http, 200, Transmission, https://downloads.julienmalka.me +http, 200, Sonarr, https://series.julienmalka.me +http, 200, Radarr, https://films.julienmalka.me +http, 200, Jackett, https://jackett.julienmalka.me/UI/Dashboard +port, 0, Newton, newton.julienmalka.me 45 +http, 200, Cloud, cloud.julienmalka.me diff --git a/modules/status/default.nix b/modules/status/default.nix index 9989f2a..0e59660 100644 --- a/modules/status/default.nix +++ b/modules/status/default.nix @@ -5,7 +5,7 @@ let in { - options.luj.jackett = { + options.luj.status = { enable = mkEnableOption "activate status page"; nginx.enable = mkEnableOption "activate nginx"; nginx.subdomain = mkOption { @@ -16,16 +16,20 @@ in config = mkIf cfg.enable ( mkMerge [{ systemd = { - timers.simple-timer = { + timers.tinystatus = { wantedBy = [ "timers.target" ]; partOf = [ "tinystatus.service" ]; - timerConfig.OnCalendar = "minutely"; + timerConfig.OnCalendar = "*-*-* *:05,10,15,20,25,30,35,40,45,50,55:00"; + timerConfig.Unit = "tinystatus.service"; }; services.tinystatus = { serviceConfig.Type = "oneshot"; + path = [ pkgs.gawk pkgs.gnused pkgs.curl pkgs.netcat pkgs.unixtools.ping ]; script = '' - mkdir -p /var/www/status - ${pkgs.tinystatus}/bin/tinystatus ${./checks.csv} > /var/www/status/index.html + mkdir -p /var/www/status + ${pkgs.tinystatus}/bin/tinystatus ${./checks.csv} > /var/www/status/index.html + ${pkgs.gnused}/bin/sed -i 's/tinystatus/Services status/g' /var/www/status/index.html + ${pkgs.gnused}/bin/sed -i 's/80%/60%/g' /var/www/status/index.html ''; }; };