Merge branch 'main' into add-auto-merge-workflow

This commit is contained in:
Hari 2026-04-01 14:32:04 -04:00 committed by GitHub
commit f2606eea3d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -12,7 +12,7 @@ let
sandboxDomain = "netty.harivan.sh"; sandboxDomain = "netty.harivan.sh";
forgejoDomain = "git.harivan.sh"; forgejoDomain = "git.harivan.sh";
vaultDomain = "vault.harivan.sh"; vaultDomain = "vault.harivan.sh";
forgejoApiUrl = "http://127.0.0.1:3000"; forgejoApiUrl = "http://127.0.0.1:19300";
sandboxAgentPackage = pkgs.callPackage ../../pkgs/sandbox-agent { }; sandboxAgentPackage = pkgs.callPackage ../../pkgs/sandbox-agent { };
sandboxAgentDir = "/home/${username}/.config/sandbox-agent"; sandboxAgentDir = "/home/${username}/.config/sandbox-agent";
sandboxAgentPath = sandboxAgentPath =
@ -222,7 +222,7 @@ in
virtualHosts.${forgejoDomain} = { virtualHosts.${forgejoDomain} = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
locations."/".proxyPass = "http://127.0.0.1:3000"; locations."/".proxyPass = "http://127.0.0.1:19300";
}; };
virtualHosts.${vaultDomain} = { virtualHosts.${vaultDomain} = {
@ -267,7 +267,7 @@ in
server = { server = {
DOMAIN = forgejoDomain; DOMAIN = forgejoDomain;
ROOT_URL = "https://${forgejoDomain}/"; ROOT_URL = "https://${forgejoDomain}/";
HTTP_PORT = 3000; HTTP_PORT = 19300;
SSH_DOMAIN = forgejoDomain; SSH_DOMAIN = forgejoDomain;
}; };
service.DISABLE_REGISTRATION = true; service.DISABLE_REGISTRATION = true;