Home

tailproxy @main - refs - log -
-
https://git.jolheiser.com/tailproxy.git
Tailscale reverse proxy
tree log patch
update nix module
Signature
-----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgBTEvCQk6VqUAdN2RuH6bj1dNkY oOpbPWj+jw4ua1B1cAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 AAAAQNA3OyHGF9K3K2N/1P0e5ZPSAHnCQCAttniByYysw0RBIjcA5PESorShiYPucatSuM 91wEhdrzVq+5ZrkCXyHgs= -----END SSH SIGNATURE-----
jolheiser <git@jolheiser.com>
4 weeks ago
1 changed files, 6 additions(+), 6 deletions(-)
M nix/module.nix -> nix/module.nix
diff --git a/nix/module.nix b/nix/module.nix
index 1734e9fc5e8d0ee80bbd11946acd403a3de70b9c..8854312edf648e59770f86544af9c79d12cc5d43 100644
--- a/nix/module.nix
+++ b/nix/module.nix
@@ -27,7 +27,7 @@           type = types.str;
           description = "Tailscale hostname";
         };
 
-        auth-key = mkOption {
+        authKey = mkOption {
           type = types.nullOr types.str;
           default = null;
           description = "Tailscale auth key";
@@ -38,7 +38,7 @@           type = types.bool;
           description = "Expose on Tailscale funnel";
         };
 
-        data-dir = mkOption {
+        dataDir = mkOption {
           type = types.str;
           description = "tsnet data directory";
           default = "/var/lib/tailproxy-${name}";
@@ -82,14 +82,14 @@         serviceConfig = {
           ExecStart =
             let
               args =
-                lib.optionals (instanceCfg.auth-key != null) [
+                lib.optionals (instanceCfg.authKey != null) [
-                  "--auth-key=${instanceCfg.auth-key}"
+                  "--auth-key=${instanceCfg.authKey}"
                 ]
                 ++ [
                   (lib.optionalString instanceCfg.funnel "--funnel")
                   "--hostname=${instanceCfg.hostname}"
                   "--port=${builtins.toString instanceCfg.port}"
-                  "--data-dir=${instanceCfg.data-dir}"
+                  "--data-dir=${instanceCfg.dataDir}"
                 ];
             in
             "${instanceCfg.package}/bin/tailproxy ${lib.concatStringsSep " " args}";
@@ -104,7 +104,7 @@       name: instanceCfg:
       lib.nameValuePair instanceCfg.user {
         isSystemUser = true;
         group = instanceCfg.user;
-        home = instanceCfg.data-dir;
+        home = instanceCfg.dataDir;
         createHome = true;
       }
     ) (lib.filterAttrs (name: instanceCfg: instanceCfg.enable) cfg.instances);