all repos — nixfiles @ fb9a8636c9ef5033324f4203c61dc657d92bd95c

System and user configuration, managed by nix and home-manager

adguard-home: simplify module

Alin
commit

fb9a8636c9ef5033324f4203c61dc657d92bd95c

parent

9b91f2c3c0327e57b495dd4e3ce3b9a2a8440059

1 file changed, 5 insertions(+), 6 deletions(-)

changed files
M system/settings/services/adguard-home.nix → system/settings/services/adguard-home.nix
@@ -17,12 +17,12 @@ v6s = byFamily.right;
   v4s = byFamily.wrong;
 in
 {
-  security.acme.certs."${subdomain}" = {
+  security.acme.certs.${subdomain} = {
     inheritDefaults = false;
     extraDomainNames = addrs;
 
     server = "https://acme.${domain}/acme/home/directory";
-    listenHTTP = "${netlib.wrapv6 (builtins.head addrs)}:8080";
+    listenHTTP = ":8080";
 
     group = "adguardhome";
     reloadServices = [ "adguardhome" ];

@@ -68,7 +68,7 @@ cache_size = 100 * 1024 * 1024;
       };
       tls = {
         enabled = true;
-        server_name = "${subdomain}";
+        server_name = subdomain;
         port_https = 0; # disabled, not random
         port_dns_over_tls = 853;
         port_dns_over_quic = 853;

@@ -83,8 +83,7 @@ services.dnsmasq.settings.host-record = [
     "${subdomain},${builtins.head v4s},${builtins.head v6s},${toString (24 * 60 * 60)}"
   ];
   services.caddy.virtualHosts = {
-    "${subdomain}" = {
-      listenAddresses = addrs;
+    ${subdomain} = {
       serverAliases = addrs;
 
       extraConfig = ''

@@ -94,7 +93,7 @@ ca home
           }
         }
         reverse_proxy /.well-known/acme-challenge/* {
-          to ${cert.listenHTTP}
+          to localhost${cert.listenHTTP}
         }
         reverse_proxy * ${backend.host}:${toString backend.port}
       '';