diff --git a/app/codehosting/forgejo.libsonnet b/app/codehosting/forgejo.libsonnet index 9abbcf1a..02229ea0 100644 --- a/app/codehosting/forgejo.libsonnet +++ b/app/codehosting/forgejo.libsonnet @@ -44,6 +44,7 @@ local postgres = import "../../kube/postgres.libsonnet"; # Forgejo configuration, roughly representing the structure of app.ini instanceName: error "instanceName (e.g. 'Warsaw Hackerspace Forgejo') must be set", runMode: "prod", + altDomains: [], server: { domain: error "domain (e.g. git.hackerspace.pl) must be set", sshDomain: cfg.server.domain, @@ -235,17 +236,18 @@ local postgres = import "../../kube/postgres.libsonnet"; }, spec+: { tls: [ - { hosts: [cfg.server.domain], secretName: forgejo.name("acme") }, + { hosts: [cfg.server.domain] + cfg.altDomains, secretName: forgejo.name("acme") }, ], rules: [ { - host: cfg.server.domain, + host: domain, http: { paths: [ { path: "/", backend: forgejo.svc.name_port }, ], }, } + for domain in [cfg.server.domain] + cfg.altDomains ], }, }, diff --git a/app/codehosting/prod.jsonnet b/app/codehosting/prod.jsonnet index 891463b7..19912996 100644 --- a/app/codehosting/prod.jsonnet +++ b/app/codehosting/prod.jsonnet @@ -12,8 +12,9 @@ local forgejo = import "forgejo.libsonnet"; admin_email: "bofh@hackerspace.pl", instanceName: "Warsaw Hackerspace Codehosting", + altDomains: [], server+: { - domain: "git.hackerspace.pl", + domain: "code.hackerspace.pl", }, }, },