about summary refs log tree commit diff
path: root/ops/nixos
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2020-06-12T01·01+0100
committertazjin <mail@tazj.in>2020-06-12T01·14+0000
commit37bbc431464245cef2df2dccafb722b012281a3f (patch)
tree8f6538b1126bb9fa09e591fa71d68fe4d4811fd0 /ops/nixos
parent79fdb0bb5fece3ef8b3a1363bf5e4e04edfe8e0f (diff)
feat(camden): Move cgit to code.tvl.fyi r/916
Moves the host at which cgit is served to 'code.tvl.fyi'.

Also updates related projects that link to this, most importantly:

* Hound's & Gerrit's cgit link bases have been updated
* besadii is updated to request CI builds for the new location

Change-Id: I44e3e584010ac29cc913ebb1a197c996eb024d80
Reviewed-on: https://cl.tvl.fyi/c/depot/+/71
Reviewed-by: lukegb <lukegb@tvl.fyi>
Diffstat (limited to 'ops/nixos')
-rw-r--r--ops/nixos/camden/default.nix17
-rw-r--r--ops/nixos/modules/monorepo-gerrit.nix2
2 files changed, 14 insertions, 5 deletions
diff --git a/ops/nixos/camden/default.nix b/ops/nixos/camden/default.nix
index b0023be8fadf..0eabd372858f 100644
--- a/ops/nixos/camden/default.nix
+++ b/ops/nixos/camden/default.nix
@@ -256,7 +256,7 @@ in lib.fix(self: {
       url = "file:///var/lib/gerrit/git/depot.git";
       vcs = "git";
       url-pattern = {
-        base-url = "https://git.tazj.in/tree/{path}{anchor}";
+        base-url = "https://code.tvl.fyi/tree/{path}{anchor}";
         anchor = "#n{line}";
       };
     };
@@ -373,9 +373,8 @@ in lib.fix(self: {
     };
 
     virtualHosts.cgit = {
-      serverName = "git.tazj.in";
-      serverAliases = [ "git.camden.tazj.in" ];
-      useACMEHost = "tazj.in";
+      serverName = "code.tvl.fyi";
+      useACMEHost = "tvl.fyi";
       addSSL = true;
 
       extraConfig = ''
@@ -391,6 +390,16 @@ in lib.fix(self: {
       '';
     };
 
+    virtualHosts.cgit-old = {
+      serverName = "git.tazj.in";
+      useACMEHost = "tazj.in";
+      addSSL = true;
+
+      extraConfig = ''
+        return 301 https://code.tvl.fyi$request_uri;
+      '';
+    };
+
     virtualHosts.hound = {
       serverName = "cs.tazj.in";
       useACMEHost = "tazj.in";
diff --git a/ops/nixos/modules/monorepo-gerrit.nix b/ops/nixos/modules/monorepo-gerrit.nix
index 48e7a28037e9..b51a6d8b294c 100644
--- a/ops/nixos/modules/monorepo-gerrit.nix
+++ b/ops/nixos/modules/monorepo-gerrit.nix
@@ -20,7 +20,7 @@ in {
       # Configure for cgit.
       gitweb = {
         type = "custom";
-        url = "https://git.tazj.in";
+        url = "https://code.tvl.fyi";
         project = "/";
         revision = "/commit/?id=\${commit}";
         branch = "/log/?h=\${branch}";