tixie/nixcfg
1
0
Fork 0
forked from Deuxfleurs/nixcfg
Code Pull requests Activity

Add possible public_ipv4 node tag

Browse source
This commit is contained in:
Alex 2022-12-07 17:13:03 +01:00
parent 4c50dd57f1
commit a1fc396412
Signed by untrusted user: lx
GPG key ID: 0E496D15096376BE
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cluster/staging/site/neptune.nix
View file

@ -9,6 +9,10 @@
deuxfleurs.nameservers = [ "192.168.1.1" ];
deuxfleurs.cname_target = "neptune.site.staging.deuxfleurs.org.";
# no public ipv4 is used for the staging cluster on Neptune,
# because the Internet connection is already used for the prod cluster
# deuxfleurs.public_ipv4 = "77.207.15.215";
networking.firewall.allowedTCPPorts = [ 80 443 ];
services.cron = {

13
nix/deuxfleurs.nix
View file

@ -90,9 +90,15 @@ in
description = "Site (availability zone) on which this node is deployed";
type = types.str;
};
cname_target = mkOption {
description = "DNS CNAME target to use for services hosted in this site, for domain names that are updated by DiploNAT";
public_ipv4 = mkOption {
description = "Public IPv4 through which this node is accessible (possibly after port opening using DiploNAT), for domain names that are updated by D53";
type = types.nullOr types.str;
default = null;
};
cname_target = mkOption {
description = "DNS CNAME target to use for services hosted in this site, for domain names that are updated by D53";
type = types.nullOr types.str;
default = null;
};
nameservers = mkOption {
description = "External DNS servers to use";
@ -133,6 +139,9 @@ in
"site" = cfg.site_name;
"public_ipv6" = cfg.ipv6;
} //
(if cfg.public_ipv4 != null
then { "public_ipv4" = cfg.public_ipv4; }
else {}) //
(if cfg.cname_target != null
then { "cname_target" = cfg.cname_target; }
else {});