From 37bbc431464245cef2df2dccafb722b012281a3f Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Fri, 12 Jun 2020 02:01:08 +0100
Subject: feat(camden): Move cgit to code.tvl.fyi

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>
---
 ops/besadii/main.go                   | 10 +++++-----
 ops/nixos/camden/default.nix          | 17 +++++++++++++----
 ops/nixos/modules/monorepo-gerrit.nix |  2 +-
 web/cgit-taz/default.nix              |  2 +-
 web/homepage/entries.nix              |  6 +++---
 web/tvl/default.nix                   |  2 +-
 6 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/ops/besadii/main.go b/ops/besadii/main.go
index 72bba769f5d6..b035dc0a39bc 100644
--- a/ops/besadii/main.go
+++ b/ops/besadii/main.go
@@ -65,7 +65,7 @@ type Manifest struct {
 func prepareManifest(commit string) string {
 	m := Manifest{
 		Image:   "nixos/latest",
-		Sources: []string{"https://git.tazj.in/"},
+		Sources: []string{"https://code.tvl.fyi/"},
 
 		// secret for cachix/tazjin
 		Secrets: []string{"f7f02546-4d95-44f7-a98e-d61fdded8b5b"},
@@ -74,15 +74,15 @@ func prepareManifest(commit string) string {
 			{"setup": `# sourcehut does not censor secrets in builds, hence this hack:
 echo -n 'export CACHIX_SIGNING_KEY=' >> ~/.buildenv
 cat ~/.cachix-tazjin >> ~/.buildenv
-nix-env -iA third_party.cachix -f git.tazj.in
+nix-env -iA third_party.cachix -f code.tvl.fyi
 cachix use tazjin
-cd git.tazj.in
+cd code.tvl.fyi
 git checkout ` + commit},
 
-			{"build": `cd git.tazj.in
+			{"build": `cd code.tvl.fyi
 nix-build ci-builds.nix > built-paths`},
 
-			{"cache": `cd git.tazj.in
+			{"cache": `cd code.tvl.fyi
 cat built-paths | cachix push tazjin`},
 		},
 
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}";
diff --git a/web/cgit-taz/default.nix b/web/cgit-taz/default.nix
index 10e573c5d7c8..7266ae00aabe 100644
--- a/web/cgit-taz/default.nix
+++ b/web/cgit-taz/default.nix
@@ -28,7 +28,7 @@ let
     repo.path=/var/lib/gerrit/git/depot.git/
     repo.desc=monorepo for tazjin's virus lounge
     repo.owner=tazjin <mail@tazj.in>
-    repo.clone-url=https://git.tazj.in
+    repo.clone-url=https://code.tvl.fyi
   '';
 
   thttpdConfig = writeText "thttpd.conf" ''
diff --git a/web/homepage/entries.nix b/web/homepage/entries.nix
index 9c7d04187b11..92749368f486 100644
--- a/web/homepage/entries.nix
+++ b/web/homepage/entries.nix
@@ -9,7 +9,7 @@
   {
     class = "project";
     title = "depot";
-    url = "https://git.tazj.in/about";
+    url = "https://code.tvl.fyi/about";
     date = 1576800000;
     description = "Merging all of my projects into a single, Nix-based monorepo";
   }
@@ -23,7 +23,7 @@
   {
     class = "project";
     title = "kontemplate";
-    url = "https://git.tazj.in/about/ops/kontemplate";
+    url = "https://code.tvl.fyi/about/ops/kontemplate";
     date = 1486550940;
     description = "Simple file templating tool built for Kubernetes resources";
   }
@@ -37,7 +37,7 @@
   {
     class = "project";
     title = "journaldriver";
-    url = "https://git.tazj.in/about/ops/journaldriver";
+    url = "https://code.tvl.fyi/about/ops/journaldriver";
     date = 1527375600;
     description = "Small daemon to forward logs from journald to Stackdriver Logging";
   }
diff --git a/web/tvl/default.nix b/web/tvl/default.nix
index d12da82817a7..a340d35a92ef 100644
--- a/web/tvl/default.nix
+++ b/web/tvl/default.nix
@@ -55,7 +55,7 @@ let
         <p class="footer">
           <a class="uncoloured-link" href="https://tazj.in">homepage</a>
           |
-          <a class="uncoloured-link" href="https://git.tazj.in/about">code</a>
+          <a class="uncoloured-link" href="https://code.tvl.fyi/about">code</a>
           |
           <a class="uncoloured-link" href="https://twitter.com/tazjin">twitter</a>
         </p>
-- 
cgit 1.4.1