all repos — nixfiles @ a1eae40100b330b9fea6a8e5b28605c223663fcd

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

use predefined fqdn instead of generating every time

Alin
commit

a1eae40100b330b9fea6a8e5b28605c223663fcd

parent

25bd841dcab3ee6d6af260147934a3fb029f0b24

4 files changed, 10 insertions(+), 10 deletions(-)

changed files
M system/roles/home-automation.nix → system/roles/home-automation.nix
@@ -3,7 +3,7 @@ config,
   ...
 }:
 let
-  inherit (config.networking) hostName domain;
+  inherit (config.networking) domain fqdn;
 
   image = "ghcr.io/home-assistant/home-assistant";
   tag = "stable";

@@ -58,6 +58,6 @@ };
   };
 
   services.dnsmasq.settings.cname = [
-    "ha.${domain},${hostName}.${domain}"
+    "ha.${domain},${fqdn}"
   ];
 }
M system/roles/local-ca.nix → system/roles/local-ca.nix
@@ -3,7 +3,7 @@ config,
   ...
 }:
 let
-  inherit (config.networking) hostName domain;
+  inherit (config.networking) domain fqdn;
 in
 {
   services.caddy = {

@@ -17,7 +17,7 @@ }
       skip_install_trust
     '';
     virtualHosts = {
-      "${hostName}.${domain}" = {
+      "${fqdn}" = {
         extraConfig = ''
           tls {
             issuer internal {

@@ -52,6 +52,6 @@ };
   };
 
   services.dnsmasq.settings.cname = [
-    "acme.${domain},ca.${domain},${hostName}.${domain}"
+    "acme.${domain},ca.${domain},${fqdn}"
   ];
 }
M system/roles/router.nix → system/roles/router.nix
@@ -9,7 +9,7 @@ wan = config.networking.nat.externalInterface;
   lans = config.networking.nat.internalInterfaces;
   lan = builtins.head lans;
 
-  inherit (config.networking) domain hostName;
+  inherit (config.networking) domain hostName fqdn;
 
   wanPrefixLen = 56;
 

@@ -69,7 +69,7 @@ ];
     }
     // (lib.genAttrs myAddresses (
       lib.const [
-        "${hostName}.${domain}"
+        "${fqdn}"
         "${hostName}"
       ]
     ));

@@ -351,7 +351,7 @@ ];
       local-ttl = 1; # defaults to 0 (client should not cache), but 1s shouldn't hurt
       interface-name = [
         "${hostName},${lan}" # prevents returning 127.0.0.2
-        "${hostName}.${domain},${lan}" # prevents returning 127.0.0.2
+        "${fqdn},${lan}" # prevents returning 127.0.0.2
         "wan.${domain},${wan}/6"
       ];
     };
M system/settings/services/adguard-home.nix → system/settings/services/adguard-home.nix
@@ -3,7 +3,7 @@ config,
   ...
 }:
 let
-  inherit (config.networking) domain hostName;
+  inherit (config.networking) domain fqdn;
 
   backend = config.services.adguardhome;
 in

@@ -36,7 +36,7 @@ };
   };
 
   services.dnsmasq.settings.cname = [
-    "dns.${domain},${hostName}.${domain}"
+    "dns.${domain},${fqdn}"
   ];
   services.caddy.virtualHosts = {
     "dns.${domain}" = {