Compare commits

...

2 Commits

2 changed files with 19 additions and 3 deletions

View File

@ -2,6 +2,7 @@
config, config,
pkgs, pkgs,
lib, lib,
systemConfig,
common, common,
... ...
}: }:
@ -26,6 +27,9 @@ in
database.type = "postgres"; database.type = "postgres";
# Enable support for Git Large File Storage # Enable support for Git Large File Storage
lfs.enable = true; lfs.enable = true;
secrets.mailer.PASSWD = config.sops.secrets."mailserver/password-hash".path;
settings = { settings = {
server = { server = {
DOMAIN = domain; DOMAIN = domain;
@ -48,10 +52,9 @@ in
PROTOCOL = "smtps"; PROTOCOL = "smtps";
SMTP_ADDR = config.mailserver.fqdn; SMTP_ADDR = config.mailserver.fqdn;
FROM = "noreply-forgejo@${common.domain}"; FROM = "noreply-forgejo@${common.domain}";
USER = "noreply@${common.domain}"; USER = "${systemConfig.username}@${common.domain}";
}; };
}; };
#mailerPasswordFile = config.sops.secrets."forgejo/mailer-password".path;
}; };
gitea-actions-runner = { gitea-actions-runner = {
package = pkgs.forgejo-actions-runner; package = pkgs.forgejo-actions-runner;

View File

@ -51,7 +51,20 @@ in
# Headscale # Headscale
"vpn.${domain}" = proxyLocations { "vpn.${domain}" = proxyLocations {
"/web".proxyPass = "${homelab}:8084"; "/web".proxyPass = "${homelab}:8084";
"/".proxyPass = "${homelab}:8082"; "/" = {
proxyPass = "${homelab}:8082";
extraConfig = ''
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_redirect http:// https://;
proxy_buffering off;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always;
'';
};
}; };
# Headscale SmartDNS # Headscale SmartDNS
"dns.${domain}" = homelabProxy 8082; "dns.${domain}" = homelabProxy 8082;