Update from update-inputs-2024-10-02-04-20

config/hosts/emilia/configuration.nix

@@ -7,6 +7,7 @@
     ../../services/nginx.nix
     ../../services/uptime-kuma.nix
     ../../services/vaultwarden.nix
+    ../../services/librespeed.nix
     ./disko.nix
     ./hardware-configuration.nix
   ];

config/hosts/seras/configuration.nix

@@ -8,7 +8,6 @@
     ../../services/nginx.nix
     ../../services/hydra
     ../../services/update-nixfiles.nix
-    ../../services/librespeed.nix
   ];
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 

flake.lock

@@ -155,11 +155,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727531434,
-        "narHash": "sha256-b+GBgCWd2N6pkiTkRZaMFOPztPO4IVTaclYPrQl2uLk=",
+        "lastModified": 1727809780,
+        "narHash": "sha256-7W5HE2IRiZglMBKcn9JtC6bveE6/F7IzQyV2XDanGFA=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "b709e1cc33fcde71c7db43850a55ebe6449d0959",
+        "rev": "6c5ba9ec9d470c1ca29e7735762c9c366e28f7f5",
         "type": "github"
       },
       "original": {

modules/librespeed/default.nix

@@ -1,10 +1,18 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   cfg = config.services.librespeed;
-in {
-  options.services.librespeed = let
+in
+{
+  options.services.librespeed =
+    let
       inherit (lib) mkOption types;
-  in {
+    in
+    {
       enable = lib.mkEnableOption "LibreSpeed server";
       package = lib.mkPackageOption pkgs "librespeed-rust" { };
       domain = mkOption {
@@ -20,7 +28,8 @@ in {
           Whether to download the IP info database before starting librespeed.
           Disable this if you want to use the Go implementation.
         '';
-      default = (!cfg.secrets ? "ipinfo_api_key");
+        default = !(cfg.secrets ? "ipinfo_api_key");
+        defaultText = lib.literalExpression ''!(cfg.secrets ? "ipinfo_api_key")'';
         type = types.bool;
       };
       openFirewall = mkOption {
@@ -49,18 +58,32 @@ in {
           [librespeed]: https://github.com/librespeed/speedtest-rust
         '';
         default = { };
-      type = with types; nullOr (attrsOf (oneOf [
+        type =
+          with types;
+          nullOr (
+            attrsOf (oneOf [
               (nullOr bool)
               int
               str
               package
-      ]));
+            ])
+          );
       };
       frontend = {
-      enable = lib.mkEnableOption "LibreSpeed frontend.";
+        enable = lib.mkEnableOption ''
+          Enables the LibreSpeed frontend and adds a nginx virtual host if
+          not explicetly disabled and `services.librespeed.domain` is not `null`.
+        '';
         contactEmail = mkOption {
           description = "Email address listed in the privacy policy.";
-        default = if (cfg.domain != null) then "webmaster@${cfg.domain}" else "webmaster@${config.networking.fqdn}";
+          default =
+            if (cfg.domain != null) then "webmaster@${cfg.domain}" else "webmaster@${config.networking.fqdn}";
+          defaultText = lib.literalExpression ''
+            if (config.services.librespeed.domain != null) then
+              "webmaster@''${config.services.librespeed.domain}"
+            else
+              "webmaster@''${config.networking.fqdn}";
+          '';
           type = types.str;
         };
         pageTitle = mkOption {
@@ -71,33 +94,43 @@ in {
         useNginx = mkOption {
           description = ''
             Configure nginx for the LibreSpeed frontend.
-          This will only create a virtual host for the frontend and won't proxy all requests because,
+            This will only create a virtual host for the frontend and won't proxy all requests because
             the reported upload and download speeds are inaccurate if proxied.
           '';
           default = cfg.domain != null;
+          defaultText = lib.literalExpression "config.services.librespeed.domain != null";
           type = types.bool;
         };
         settings = mkOption {
           description = ''
-          Override default test parameters.
+            Override default settings of the speedtest web client.
             See [speedtest_worker.js][link] for a list of possible values.
 
             [link]: https://github.com/librespeed/speedtest/blob/master/speedtest_worker.js#L39
           '';
-        default = {};
-        type = with types; nullOr (attrsOf (oneOf [
+          default = {
+            telemetry_level = "basic";
+          };
+          type =
+            with types;
+            nullOr (
+              attrsOf (oneOf [
                 bool
                 int
                 str
                 float
-        ]));
+              ])
+            );
         };
         servers = mkOption {
           description = "LibreSpeed servers that should apper in the server list.";
-        type = types.listOf (types.submodule {
-          options = let
+          type = types.listOf (
+            types.submodule {
+              options =
+                let
                   inherit (types) nonEmptyStr;
-          in {
+                in
+                {
                   name = mkOption {
                     description = "Name shown in the server list.";
                     type = nonEmptyStr;
@@ -139,13 +172,20 @@ in {
                     type = nonEmptyStr;
                   };
                 };
-        });
+            }
+          );
         };
       };
     };
-  config = lib.mkIf cfg.enable (let
-    librespeedAssets = pkgs.runCommand "librespeed-assets" (let
-      mapValue = arg: if (lib.isBool arg) then
+  config = lib.mkIf cfg.enable (
+    let
+      librespeedAssets =
+        pkgs.runCommand "librespeed-assets"
+          (
+            let
+              mapValue =
+                arg:
+                if (lib.isBool arg) then
                   lib.boolToString arg
                 else if ((lib.isInt arg) || (lib.isFloat arg)) then
                   toString arg
@@ -157,7 +197,8 @@ in {
                 (lib.attrValues)
                 (lib.concatLines)
               ];
-    in {
+            in
+            {
               preferLocal = true;
 
               serversList = ''
@@ -168,7 +209,9 @@ in {
                 ${mapSettings}
                 }
               '';
-    }) ''
+            }
+          )
+          ''
             cp -r ${pkgs.librespeed-rust}/assets $out
             chmod 666 $out/servers_list.js
             cat >$out/servers_list.js <<<"$serversList"
@@ -178,7 +221,8 @@ in {
               --replace-fail "PUT@YOUR_EMAIL.HERE" ${lib.escapeShellArg (lib.escapeXML cfg.frontend.contactEmail)} \
               --replace-fail "TO BE FILLED BY DEVELOPER" ${lib.escapeShellArg (lib.escapeXML cfg.frontend.contactEmail)}
           '';
-  in {
+    in
+    {
       assertions = [
         {
           assertion = cfg.frontend.useNginx -> cfg.domain != null;
@@ -194,35 +238,57 @@ in {
       services.nginx.virtualHosts = lib.mkIf (cfg.frontend.enable && cfg.frontend.useNginx) {
         ${cfg.domain} = {
           locations."/".root = librespeedAssets;
-        locations."/backend/".extraConfig = "return 301 https://$host:${toString cfg.settings.listen_port}$request_uri;";
+          locations."/backend/" = {
+            proxyPass = "http://${cfg.settings.bind_address}:${toString cfg.settings.listen_port}/backend/";
+            extraConfig = ''
+              # add_header Cache-Control 'no-store, no-cache, max-age=0, no-transform';
+              # add_header Last-Modified $date_gmt;
+              if_modified_since off;
+              expires off;
+              etag off;
+
+              access_log off;
+              gzip off;
+              log_not_found off;
+              server_tokens off;
+              tcp_nodelay on;
+              tcp_nopush on;
+              sendfile on;
+              client_max_body_size 50M;
+              proxy_read_timeout 999;
+              proxy_buffers 16 128k;
+            '';
+          };
           enableACME = true;
           forceSSL = true;
         };
       };
       security.acme.certs = lib.mkIf (cfg.domain != null) {
-      ${cfg.domain} = {
+        ${cfg.domain} = lib.mkIf (!cfg.frontend.useNginx) {
           reloadServices = [ "librespeed.service" ];
-        webroot = "/var/lib/acme/acme-challange";
+          webroot = "/var/lib/acme/acme-challenge";
         };
       };
 
       services.librespeed.frontend.servers = lib.mkIf (cfg.frontend.enable && (cfg.domain != null)) [
         {
           name = cfg.domain;
-        server = "//${cfg.domain}:${toString cfg.settings.listen_port}";
+          server = "//${cfg.domain}${lib.optionalString (!cfg.frontend.useNginx) ":${toString cfg.settings.listen_port}"}";
         }
       ];
-    services.librespeed.frontend.settings = lib.mkIf cfg.frontend.enable {
-      telemetry_level = lib.mkDefault "basic";
-    };
 
-    services.librespeed.settings = let
+      services.librespeed.settings =
+        let
           inherit (lib) mkDefault mkIf;
-    in {
-      assets_path = if (cfg.frontend.enable && !cfg.frontend.useNginx) then librespeedAssets 
-      else pkgs.writeTextDir "index.html" "";
+        in
+        {
+          assets_path =
+            if (cfg.frontend.enable && !cfg.frontend.useNginx) then
+              librespeedAssets
+            else
+              pkgs.writeTextDir "index.html" "";
 
-      bind_address = mkDefault "::";
+          bind_address = mkDefault "127.0.0.1";
           listen_port = mkDefault 8989;
           base_url = mkDefault "backend";
           worker_threads = mkDefault "auto";
@@ -233,47 +299,68 @@ in {
           #librespeed-rust will fail to start if the following config parameters are omitted.
           ipinfo_api_key = mkIf (!cfg.secrets ? "ipinfo_api_key") "";
           stats_password = mkIf (!cfg.secrets ? "stats_password") "";
-      tls_cert_file = if (cfg.domain != null) then (mkDefault "/run/credentials/librespeed.service/cert.pem") else (mkDefault "");
-      tls_key_file = if (cfg.domain != null) then (mkDefault "/run/credentials/librespeed.service/key.pem") else (mkDefault "");
+          tls_cert_file =
+            if (cfg.domain != null && !cfg.frontend.useNginx) then
+              (mkDefault "/run/credentials/librespeed.service/cert.pem")
+            else
+              (mkDefault "");
+          tls_key_file =
+            if (cfg.domain != null && !cfg.frontend.useNginx) then
+              (mkDefault "/run/credentials/librespeed.service/key.pem")
+            else
+              (mkDefault "");
 
-      enable_tls = mkDefault (cfg.domain != null);
+          enable_tls = mkDefault (cfg.domain != null && !cfg.frontend.useNginx);
         };
 
-    systemd.services = let
-      configFile = let
-        mapValue = arg: if (lib.isBool arg) then
+      systemd.services =
+        let
+          configFile =
+            let
+              mapValue =
+                arg:
+                if (lib.isBool arg) then
                   lib.boolToString arg
                 else if (lib.isInt arg) then
                   toString arg
-        else "\"${lib.escape [ "\"" ] (toString arg)}\"";
+                else
+                  "\"${lib.escape [ "\"" ] (toString arg)}\"";
             in
-        with lib; pipe cfg.settings [
+            with lib;
+            pipe cfg.settings [
               (filterAttrs (_: val: val != null))
               (mapAttrs (name: val: "${name}=${mapValue val}"))
               (attrValues)
               (concatLines)
               (pkgs.writeText "${cfg.package.name}-config.toml")
             ];
-    in {
+        in
+        {
           librespeed-secrets = lib.mkIf (cfg.secrets != { }) {
             description = "LibreSpeed secret helper";
 
-        ExecStart = let
+            ExecStart =
+              let
                 script = pkgs.writeShellApplication {
                   name = "librespeed-secrets";
                   runtimeInputs = [ pkgs.coreutils ];
-            text = ''
+                  text =
+                    ''
                       cp ${configFile} ''${RUNTIME_DIRECTORY%%:*}/config.toml
-            '' + lib.pipe cfg.secrets [
-              (lib.mapAttrs (name: file: ''
+                    ''
+                    + lib.pipe cfg.secrets [
+                      (lib.mapAttrs (
+                        name: file: ''
                           cat >>''${RUNTIME_DIRECTORY%%:*}/config.toml <<EOF
                           ${name}="$(<${lib.escapeShellArg file})"
                           EOF
-              ''))
+                        ''
+                      ))
                       (lib.concatLines lib.attrValues)
                     ];
                 };
-        in lib.getExe script;
+              in
+              lib.getExe script;
 
             serviceConfig = {
               Type = "oneshot";
@@ -294,13 +381,15 @@ in {
 
               DynamicUser = true;
 
-          LoadCredential = lib.mkIf (cfg.domain != null) [
+              LoadCredential = lib.mkIf (cfg.domain != null && !cfg.frontend.useNginx) [
                 "cert.pem:${config.security.acme.certs.${cfg.domain}.directory}/cert.pem"
                 "key.pem:${config.security.acme.certs.${cfg.domain}.directory}/key.pem"
               ];
 
               ExecStartPre = lib.mkIf cfg.downloadIPDB "${lib.getExe cfg.package} --update-ipdb";
-          ExecStart = "${lib.getExe cfg.package} -c ${if (cfg.secrets == {}) then configFile else "\${RUNTIME_DIRECTORY%%:*}/config.toml"}";
+              ExecStart = "${lib.getExe cfg.package} -c ${
+                if (cfg.secrets == { }) then configFile else "\${RUNTIME_DIRECTORY%%:*}/config.toml"
+              }";
               WorkingDirectory = "/var/cache/librespeed";
               RuntimeDirectory = "librespeed";
               RuntimeDirectoryPreserve = true;
@@ -331,7 +420,8 @@ in {
             };
           };
         };
-  });
+    }
+  );
 
   meta.maintainers = with lib.maintainers; [ snaki ];
 }

pkgs/librespeed-rust/default.nix

@@ -4,6 +4,7 @@
   rustPlatform,
 }:
 let
+  # https://github.com/librespeed/speedtest-rust/pull/7
   version = "unstable-2024-09-28";
   src = fetchFromGitHub {
     owner = "librespeed";