diff --git a/hosts/desktopnix/net.nix b/hosts/desktopnix/net.nix index f9f94e5..7309a48 100644 --- a/hosts/desktopnix/net.nix +++ b/hosts/desktopnix/net.nix @@ -12,11 +12,4 @@ }; }; }; - networking.extraHosts = '' - 192.168.178.2 lel.lol - 192.168.178.2 pw.lel.lol - 192.168.178.2 nc.lel.lol - 192.168.178.2 adguardhome.lel.lol - 192.168.178.2 git.lel.lol - ''; } diff --git a/hosts/elisabeth/secrets/vaultwarden/vaultwarden-env.age b/hosts/elisabeth/secrets/vaultwarden/vaultwarden-env.age index 1ee2049..43b954a 100644 Binary files a/hosts/elisabeth/secrets/vaultwarden/vaultwarden-env.age and b/hosts/elisabeth/secrets/vaultwarden/vaultwarden-env.age differ diff --git a/modules/services/adguardhome.nix b/modules/services/adguardhome.nix index b30e502..407b5f9 100644 --- a/modules/services/adguardhome.nix +++ b/modules/services/adguardhome.nix @@ -12,7 +12,7 @@ bind_host = "0.0.0.0"; dns = { bind_hosts = [(lib.net.cidr.host config.secrets.secrets.global.net.ips.${config.node.name} config.secrets.secrets.global.net.privateSubnet)]; - anonymize_client_ip = true; + anonymize_client_ip = false; upstream_dns = [ "1.0.0.1" "2606:4700:4700::1111" @@ -27,7 +27,8 @@ ]; }; user_rules = [ - "||${config.secrets.secrets.global.domains.web}^$dnsrewrite=${lib.net.cidr.host config.secrets.secrets.global.net.ips.elisabeth config.secrets.secrets.global.net.privateSubnet}" + "||adguardhome.${config.secrets.secrets.global.domains.web}^$dnsrewrite=${lib.net.cidr.host config.secrets.secrets.global.net.ips.elisabeth config.secrets.secrets.global.net.privateSubnet}" + "||fritz.box^$dnsrewrite=${lib.net.cidr.host 1 config.secrets.secrets.global.net.privateSubnet}" ]; dhcp.enabled = false; ratelimit = 60; diff --git a/modules/services/gitea.nix b/modules/services/gitea.nix index 0a40a6e..8af0d89 100644 --- a/modules/services/gitea.nix +++ b/modules/services/gitea.nix @@ -45,7 +45,7 @@ in { # federation.ENABLED = true; mailer = { ENABLED = true; - HOST = config.secrets.secrets.local.gitea.mail.host; + SMTP_ADDR = config.secrets.secrets.local.gitea.mail.host; FROM = config.secrets.secrets.local.gitea.mail.from; USER = config.secrets.secrets.local.gitea.mail.user; SEND_AS_PLAIN_TEXT = true; @@ -77,7 +77,7 @@ in { DEFAULT_KEEP_EMAIL_PRIVATE = true; }; session.COOKIE_SECURE = true; - ui.DEFAULT_THEME = "forgejo-auto"; + ui.DEFAULT_THEME = "forgejo-dark"; "ui.meta" = { AUTHOR = "Patrick"; DESCRIPTION = "Tollstes Forgejo EU-West";