improve networking templating and configuration
This commit is contained in:
parent
63688f3068
commit
c58d6c89b3
8 changed files with 111 additions and 64 deletions
|
@ -1,7 +1,7 @@
|
|||
{ config, dns, ... }:
|
||||
with dns.lib.combinators;
|
||||
let
|
||||
inherit (config.lab.networking) publicIPv4 dmzServicesIPv6 dockerSwarmIPv6;
|
||||
inherit (config.lab.networking) publicIPv4 dmzServicesIPv6 dockerSwarmIPv6 publicRouterIPv6;
|
||||
in
|
||||
{
|
||||
SOA = {
|
||||
|
@ -52,7 +52,7 @@ in
|
|||
|
||||
wg = {
|
||||
A = [ publicIPv4 ];
|
||||
AAAA = [ "2a0d:6e00:1a77::1" ];
|
||||
AAAA = [ publicRouterIPv6 ];
|
||||
};
|
||||
|
||||
wg4 = {
|
||||
|
@ -62,7 +62,7 @@ in
|
|||
|
||||
wg6 = {
|
||||
A = [ ];
|
||||
AAAA = [ "2a0d:6e00:1a77::1" ];
|
||||
AAAA = [ publicRouterIPv6 ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ config, dns, ... }:
|
||||
with dns.lib.combinators;
|
||||
let
|
||||
inherit (config.lab.networking) publicIPv4 dmzServicesIPv6 dockerSwarmIPv6;
|
||||
inherit (config.lab.networking) publicIPv4 dmzServicesIPv6 dockerSwarmIPv6 publicRouterIPv6;
|
||||
in
|
||||
{
|
||||
CAA = letsEncrypt "caa@kun.is";
|
||||
|
@ -57,7 +57,7 @@ in
|
|||
# Override because wg is on opnsense so ipv6 differs from "dmzServicesIPv6"
|
||||
wg = {
|
||||
A = [ publicIPv4 ];
|
||||
AAAA = [ "2a0d:6e00:1a77::1" ];
|
||||
AAAA = [ publicRouterIPv6 ];
|
||||
};
|
||||
|
||||
};
|
||||
|
|
Reference in a new issue