kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try to get adguard login working

Browse Source
This commit is contained in:
Kopatz
2024-07-09 14:56:12 +02:00
parent 2c9d7ea1b9
commit 9005940db8
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/services/adguard.nix
View File

@@ -27,7 +27,7 @@ in {
networking.firewall.allowedUDPPorts = [ 53 ]; networking.firewall.allowedUDPPorts = [ 53 ];
security.acme.certs."${cfg.fqdn}".server = security.acme.certs."${cfg.fqdn}".server =
"https://127.0.0.1:8443/acme/acme/directory"; "https://127.0.0.1:8443/acme/kop-acme/directory";
# nginx reverse proxy # nginx reverse proxy
services.nginx.virtualHosts.${cfg.fqdn} = { services.nginx.virtualHosts.${cfg.fqdn} = {
forceSSL = cfg.useHttps; forceSSL = cfg.useHttps;
@@ -47,7 +47,7 @@ in {
services.adguardhome = { services.adguardhome = {
enable = true; enable = true;
settings = { settings = {
schema_version = 20; schema_version = 28;
users = [{ users = [{
name = "admin"; name = "admin";
password = password =
@@ -59,6 +59,7 @@ in {
protection_enabled = true; protection_enabled = true;
filtering_enabled = true; filtering_enabled = true;
upstream_dns = [ upstream_dns = [
"https://dns10.quad9.net/dns-query"
"https://doh.tiar.app/dns-query" "https://doh.tiar.app/dns-query"
"tls://getdnsapi.net" "tls://getdnsapi.net"
"https://dns.adguard-dns.com/dns-query" "https://dns.adguard-dns.com/dns-query"
@@ -156,7 +157,6 @@ in {
} }
]; ];
dhcp = { enabled = false; }; dhcp = { enabled = false; };
dhcpv6 = { enabled = false; };
tls = { enabled = false; }; tls = { enabled = false; };
}; };
}; };

2
modules/services/grafana.nix
View File

@@ -55,7 +55,7 @@ in
after = [ "step-ca.service" ]; after = [ "step-ca.service" ];
}; };
security.acme.certs."${fqdn}".server = "https://127.0.0.1:8443/acme/acme/directory"; security.acme.certs."${fqdn}".server = "https://127.0.0.1:8443/acme/kop-acme/directory";
# nginx reverse proxy # nginx reverse proxy
services.nginx.virtualHosts.${fqdn} = { services.nginx.virtualHosts.${fqdn} = {
forceSSL = useHttps; forceSSL = useHttps;

2
modules/services/invidious.nix
View File

@@ -49,7 +49,7 @@ in
nginx.enable = false; nginx.enable = false;
}; };
security.acme.certs."${fqdn}".server = "https://127.0.0.1:8443/acme/acme/directory"; security.acme.certs."${fqdn}".server = "https://127.0.0.1:8443/acme/kop-acme/directory";
services.nginx.virtualHosts."${fqdn}" = { services.nginx.virtualHosts."${fqdn}" = {
forceSSL = useHttps; forceSSL = useHttps;
enableACME = useHttps; enableACME = useHttps;

2
modules/services/kavita.nix
View File

@@ -94,7 +94,7 @@ in lib.mkIf cfg.enable {
# ''; # '';
# }; # };
security.acme.certs."${fqdn}" = lib.mkIf useStepCa { security.acme.certs."${fqdn}" = lib.mkIf useStepCa {
server = "https://127.0.0.1:8443/acme/acme/directory"; server = "https://127.0.0.1:8443/acme/kop-acme/directory";
}; };
services.nginx.virtualHosts."${fqdn}" = { services.nginx.virtualHosts."${fqdn}" = {
forceSSL = useHttps; forceSSL = useHttps;

2
modules/services/nextcloud.nix
View File

@@ -6,7 +6,7 @@ let
in in
{ {
imports = [ ./postgres.nix ]; imports = [ ./postgres.nix ];
security.acme.certs."${fqdn}".server = "https://127.0.0.1:8443/acme/acme/directory"; security.acme.certs."${fqdn}".server = "https://127.0.0.1:8443/acme/kop-acme/directory";
services.nginx = { services.nginx = {
enable = true; enable = true;

2
modules/services/step-ca.nix
View File

@@ -72,7 +72,7 @@ in
provisioners = [ provisioners = [
{ {
type = "ACME"; type = "ACME";
name = "acme"; name = "kop-acme";
forceCN = true; forceCN = true;
} }
]; ];