diff options
Diffstat (limited to 'ops/nixos')
| -rw-r--r-- | ops/nixos/camden/default.nix | 17 | ||||
| -rw-r--r-- | ops/nixos/modules/monorepo-gerrit.nix | 2 |
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}"; |