cleanup
This commit is contained in:
@@ -3,7 +3,7 @@ let
|
||||
version = "latest";
|
||||
serverCfg = config.syscfg.server;
|
||||
|
||||
LDAP_DC_DOMAIN = "dc=ldap," + (lib.concatMapStringsSep "," (x: "dc=${x}") (lib.splitString "." serverCfg.hostDomain));
|
||||
LDAP_DC_DOMAIN = "dc=ldap," + (lib.concatMapStringsSep "," (x: "dc=${x}") (lib.splitString "." serverCfg.domain));
|
||||
in {
|
||||
sops = true;
|
||||
db = true;
|
||||
@@ -49,8 +49,8 @@ in {
|
||||
GITEA__mailer__SMTP_PORT = "";
|
||||
GITEA__mailer__USER= "";
|
||||
|
||||
GITEA__server__DOMAIN = "${containerCfg.subdomain}.${serverCfg.hostDomain}";
|
||||
GITEA__server__ROOT_URL = "https://${containerCfg.subdomain}.${serverCfg.hostDomain}/";
|
||||
GITEA__server__DOMAIN = "${containerCfg.subdomain}.${serverCfg.domain}";
|
||||
GITEA__server__ROOT_URL = "https://${containerCfg.subdomain}.${serverCfg.domain}/";
|
||||
GITEA__server__PROTOCOL = "http";
|
||||
GITEA__server__HTTP_PORT = "8080";
|
||||
GITEA__server__LFS_START_SERVER = "true";
|
||||
@@ -64,7 +64,7 @@ in {
|
||||
GITEA__service__ENABLE_REVERSE_PROXY_EMAIL = "true";
|
||||
GITEA__service__ENABLE_REVERSE_PROXY_FULL_NAME = "true";
|
||||
GITEA__service__ALLOW_ONLY_EXTERNAL_REGISTRATION = "true";
|
||||
GITEA__security__REVERSE_PROXY_LOGOUT_REDIRECT = "https://${serverCfg.containers.authentik.subdomain}.${serverCfg.hostDomain}/outpost.goauthentik.io/sign_out";
|
||||
GITEA__security__REVERSE_PROXY_LOGOUT_REDIRECT = "https://${serverCfg.containers.authentik.subdomain}.${serverCfg.domain}/outpost.goauthentik.io/sign_out";
|
||||
GITEA__security__REVERSE_PROXY_AUTHENTICATION_USER = "X-authentik-username";
|
||||
GITEA__security__REVERSE_PROXY_AUTHENTICATION_EMAIL = "X-authentik-email";
|
||||
GITEA__security__REVERSE_PROXY_AUTHENTICATION_FULL_NAME = "X-authentik-name";
|
||||
@@ -72,7 +72,7 @@ in {
|
||||
GITEA__security__REVERSE_PROXY_TRUSTED_PROXIES = "127.0.0.0/8,::1/128,10.0.0.0/8";
|
||||
} else {});
|
||||
extraLabels = {
|
||||
"traefik.http.routers.${containerCfg.subdomain}-login.rule" = "Host(`${containerCfg.subdomain}.${serverCfg.hostDomain}`) && Path(`/user/login`) ";
|
||||
"traefik.http.routers.${containerCfg.subdomain}-login.rule" = "Host(`${containerCfg.subdomain}.${serverCfg.domain}`) && Path(`/user/login`) ";
|
||||
"traefik.http.routers.${containerCfg.subdomain}-login.middlewares" = if serverCfg.containers?authentik then "authentik" else "";
|
||||
"traefik.http.routers.${containerCfg.subdomain}-login.priority" = "100";
|
||||
"traefik.http.routers.${containerCfg.subdomain}-login.entrypoints" = "web-secure";
|
||||
@@ -92,8 +92,8 @@ in {
|
||||
secret = name;
|
||||
extraEnv = {
|
||||
CONFIG_FILE="/data/config.yml";
|
||||
GITEA_INSTANCE_URL="https://${containerCfg.subdomain}.${serverCfg.hostDomain}";
|
||||
GITHUB_INSTANCE_URL="https://${containerCfg.subdomain}.${serverCfg.hostDomain}";
|
||||
GITEA_INSTANCE_URL="https://${containerCfg.subdomain}.${serverCfg.domain}";
|
||||
GITHUB_INSTANCE_URL="https://${containerCfg.subdomain}.${serverCfg.domain}";
|
||||
};
|
||||
|
||||
overrides = {
|
||||
@@ -121,7 +121,7 @@ in {
|
||||
|
||||
RUNNER_TOKEN=$($GT actions generate-runner-token)
|
||||
$GTR register \
|
||||
--instance "https://${containerCfg.subdomain}.${serverCfg.hostDomain}" \
|
||||
--instance "https://${containerCfg.subdomain}.${serverCfg.domain}" \
|
||||
--token "$RUNNER_TOKEN" \
|
||||
--name "Runner" \
|
||||
--labels "ubuntu-latest:docker://catthehacker/ubuntu:act-latest" \
|
||||
|
||||
Reference in New Issue
Block a user