about summary refs log tree commit diff
path: root/ops/modules
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2022-02-16T18·34+0300
committertazjin <tazjin@tvl.su>2022-02-16T23·03+0000
commitc72c1efdebddd1d8d6c37c8efd360e1c3fcda90b (patch)
treef59ce8a536b7f4f6ac216e5e3e25ca009bf0581f /ops/modules
parentcb8f050b9c6322c060af8580bfdac44fbd13cb5e (diff)
refactor(ops/modules): Rename git-serving -> josh r/3837
cgit has its own module now

Change-Id: I9b4cc322374517b8bd3db43345831e2bf43c4bb1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5295
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'ops/modules')
-rw-r--r--ops/modules/josh.nix (renamed from ops/modules/git-serving.nix)10
-rw-r--r--ops/modules/www/code.tvl.fyi.nix2
2 files changed, 6 insertions, 6 deletions
diff --git a/ops/modules/git-serving.nix b/ops/modules/josh.nix
index 57f08cbc5f45..be9e9e966e6b 100644
--- a/ops/modules/git-serving.nix
+++ b/ops/modules/josh.nix
@@ -2,13 +2,13 @@
 { config, depot, lib, pkgs, ... }:
 
 let
-  cfg = config.services.depot.git-serving;
+  cfg = config.services.depot.josh;
 in
 {
-  options.services.depot.git-serving = with lib; {
-    enable = mkEnableOption "Enable cgit & josh configuration";
+  options.services.depot.josh = with lib; {
+    enable = mkEnableOption "Enable josh for serving the depot";
 
-    joshPort = mkOption {
+    port = mkOption {
       description = "Port on which josh should listen";
       type = types.int;
       default = 5674;
@@ -26,7 +26,7 @@ in
         DynamicUser = true;
         StateDirectory = "josh";
         Restart = "always";
-        ExecStart = "${depot.third_party.josh}/bin/josh-proxy --no-background --local /var/lib/josh --port ${toString cfg.joshPort} --remote https://cl.tvl.fyi/";
+        ExecStart = "${depot.third_party.josh}/bin/josh-proxy --no-background --local /var/lib/josh --port ${toString cfg.port} --remote https://cl.tvl.fyi/";
       };
     };
   };
diff --git a/ops/modules/www/code.tvl.fyi.nix b/ops/modules/www/code.tvl.fyi.nix
index 4c182d34f28d..3f34a9422cb1 100644
--- a/ops/modules/www/code.tvl.fyi.nix
+++ b/ops/modules/www/code.tvl.fyi.nix
@@ -22,7 +22,7 @@
 
         # Git operations on depot.git hit josh
         location /depot.git {
-            proxy_pass http://localhost:${toString config.services.depot.git-serving.joshPort};
+            proxy_pass http://localhost:${toString config.services.depot.josh.port};
         }
 
         # Git clone operations on '/' should be redirected to josh now.