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>
This commit is contained in:
parent
79fdb0bb5f
commit
37bbc43146
6 changed files with 24 additions and 15 deletions
|
@ -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`},
|
||||
},
|
||||
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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}";
|
||||
|
|
|
@ -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" ''
|
||||
|
|
|
@ -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";
|
||||
}
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue