diff --git a/domains/fudo.org.nix b/domains/fudo.org.nix index 86ded17..1b2dee6 100644 --- a/domains/fudo.org.nix +++ b/domains/fudo.org.nix @@ -24,9 +24,10 @@ postgresql-server = "nutboy3"; log-aggregator = "nutboy3"; chat-server = "legatus"; - backplane = { - nameserver = "legatus"; - dns-service = "nutboy3"; - domain = "fudo.link"; - }; + # backplane = { + # nameserver = "legatus"; + # dns-service = "nutboy3"; + # domain = "fudo.link"; + # }; + nexus.domains = [ "fudo.link" ]; } diff --git a/domains/informis.land.nix b/domains/informis.land.nix index 1e4d8b4..b141baf 100644 --- a/domains/informis.land.nix +++ b/domains/informis.land.nix @@ -21,4 +21,5 @@ dns-service = "nutboy3"; domain = "fudo.link"; }; + nexus.domains = [ "fudo.link" ]; } diff --git a/domains/sea.fudo.org.nix b/domains/sea.fudo.org.nix index 38702c9..b95b1a1 100644 --- a/domains/sea.fudo.org.nix +++ b/domains/sea.fudo.org.nix @@ -22,4 +22,5 @@ dns-service = "nutboy3"; domain = "fudo.link"; }; + nexus.domains = [ "fudo.link" ]; } diff --git a/entities.nix b/entities.nix index 78ab754..e9b3c2a 100644 --- a/entities.nix +++ b/entities.nix @@ -1,7 +1,6 @@ { helper-lib, ... }: -let - import-by-basename = helper-lib.fs.import-by-basename; +let import-by-basename = helper-lib.fs.import-by-basename; in { domains = import-by-basename ./domains; hosts = import-by-basename ./hosts; diff --git a/lib.nix b/lib.nix index d3a7f5f..70f0d8d 100644 --- a/lib.nix +++ b/lib.nix @@ -28,7 +28,11 @@ let getHostIps = hostname: filter (o: o != null) [ (getHostIpv4 hostname) (getHostIpv6 hostname) ]; + getDomainPostgresqlServer = hostname: + let domain-name = entities.hosts."${hostname}".domain; + in getHostFqdn entities.domain."${domain-name}".postgresql-server; + in { inherit getHostSite getHostDomain getHostRealm getHostFqdn getHostIpv4 - getHostIpv6 getHostIps; + getHostIpv6 getHostIps getDomainPostgresqlServer; } diff --git a/nexus/fudo.link.nix b/nexus/fudo.link.nix new file mode 100644 index 0000000..4c46957 --- /dev/null +++ b/nexus/fudo.link.nix @@ -0,0 +1,5 @@ +{ + servers = [ "nutboy3" "legatus" ]; + dns-servers = [ "legatus" ]; + gssapi-realm = "FUDO.ORG"; +} diff --git a/sites/joes-datacenter-0.nix b/sites/joes-datacenter-0.nix index 615f7d0..d27c6ac 100644 --- a/sites/joes-datacenter-0.nix +++ b/sites/joes-datacenter-0.nix @@ -8,4 +8,5 @@ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDGVez4of30f+j0cWKj5kYCKeFjyNsYvG9UbOMxF5hImD2lP5MSbFBv31gFgHjx3yCG4zQRZlpuyU5uWo0qIwe9N84/LcZcB9WrWKZXDmuof7zPFy0J+Hj+LVLDQI/mVXHNwkMhBMHpPrdwA05EYDAYCYklWT4cSByu10pHtST+olF8i+A+UQgUzgNZzdJVeiYZv6MBDTYsJWptGeDUkl2B0Es3gtbGYcCCfnyS3RC7DIXlDo3NBbAr7WaHY2MBbT+R/+jicn9E3IY3NCM5jENxqmvHy9MDsxEEYgFNm7IDwq4V1VRUWy277YsvRbmEaHb+osOA5u1VNN4z3UftOZcSZgR5C/vR71cENXoPt1YQpCzu7i38ojtvL+tDVEKT7sIovrQw8q1sszNlW2nXh8RSPiIq5TMnrV73MP0egKcr9n3tfxwi1BIkLjvfom/02BkTK9R9v+VMNhYU1YwROhORCiMIgoxUGiUvtH8u38JGr7E0hhMoAjCE5k80WPUivl0=" ]; mail-server = "mail.informis.land"; + nexus.domains = [ "fudo.link" ]; } diff --git a/sites/nuttyclub.nix b/sites/nuttyclub.nix index 8b6490c..cce87fb 100644 --- a/sites/nuttyclub.nix +++ b/sites/nuttyclub.nix @@ -9,4 +9,5 @@ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDGVez4of30f+j0cWKj5kYCKeFjyNsYvG9UbOMxF5hImD2lP5MSbFBv31gFgHjx3yCG4zQRZlpuyU5uWo0qIwe9N84/LcZcB9WrWKZXDmuof7zPFy0J+Hj+LVLDQI/mVXHNwkMhBMHpPrdwA05EYDAYCYklWT4cSByu10pHtST+olF8i+A+UQgUzgNZzdJVeiYZv6MBDTYsJWptGeDUkl2B0Es3gtbGYcCCfnyS3RC7DIXlDo3NBbAr7WaHY2MBbT+R/+jicn9E3IY3NCM5jENxqmvHy9MDsxEEYgFNm7IDwq4V1VRUWy277YsvRbmEaHb+osOA5u1VNN4z3UftOZcSZgR5C/vR71cENXoPt1YQpCzu7i38ojtvL+tDVEKT7sIovrQw8q1sszNlW2nXh8RSPiIq5TMnrV73MP0egKcr9n3tfxwi1BIkLjvfom/02BkTK9R9v+VMNhYU1YwROhORCiMIgoxUGiUvtH8u38JGr7E0hhMoAjCE5k80WPUivl0=" ]; mail-server = "mail.fudo.org"; + nexus.domains = [ "fudo.link" ]; } diff --git a/sites/portage.nix b/sites/portage.nix index 79d2207..a379c69 100644 --- a/sites/portage.nix +++ b/sites/portage.nix @@ -9,4 +9,5 @@ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDGVez4of30f+j0cWKj5kYCKeFjyNsYvG9UbOMxF5hImD2lP5MSbFBv31gFgHjx3yCG4zQRZlpuyU5uWo0qIwe9N84/LcZcB9WrWKZXDmuof7zPFy0J+Hj+LVLDQI/mVXHNwkMhBMHpPrdwA05EYDAYCYklWT4cSByu10pHtST+olF8i+A+UQgUzgNZzdJVeiYZv6MBDTYsJWptGeDUkl2B0Es3gtbGYcCCfnyS3RC7DIXlDo3NBbAr7WaHY2MBbT+R/+jicn9E3IY3NCM5jENxqmvHy9MDsxEEYgFNm7IDwq4V1VRUWy277YsvRbmEaHb+osOA5u1VNN4z3UftOZcSZgR5C/vR71cENXoPt1YQpCzu7i38ojtvL+tDVEKT7sIovrQw8q1sszNlW2nXh8RSPiIq5TMnrV73MP0egKcr9n3tfxwi1BIkLjvfom/02BkTK9R9v+VMNhYU1YwROhORCiMIgoxUGiUvtH8u38JGr7E0hhMoAjCE5k80WPUivl0=" ]; mail-server = "mail.fudo.org"; + nexus.domains = [ "fudo.link" ]; } diff --git a/sites/seattle.nix b/sites/seattle.nix index f980154..818bab1 100644 --- a/sites/seattle.nix +++ b/sites/seattle.nix @@ -10,4 +10,5 @@ enable-distributed-builds = false; mail-server = "mail.fudo.org"; local-gateway = "limina"; + nexus.domains = [ "fudo.link" ]; } diff --git a/sites/worldstream.nix b/sites/worldstream.nix index edeb3d6..8064ef6 100644 --- a/sites/worldstream.nix +++ b/sites/worldstream.nix @@ -9,4 +9,5 @@ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDGVez4of30f+j0cWKj5kYCKeFjyNsYvG9UbOMxF5hImD2lP5MSbFBv31gFgHjx3yCG4zQRZlpuyU5uWo0qIwe9N84/LcZcB9WrWKZXDmuof7zPFy0J+Hj+LVLDQI/mVXHNwkMhBMHpPrdwA05EYDAYCYklWT4cSByu10pHtST+olF8i+A+UQgUzgNZzdJVeiYZv6MBDTYsJWptGeDUkl2B0Es3gtbGYcCCfnyS3RC7DIXlDo3NBbAr7WaHY2MBbT+R/+jicn9E3IY3NCM5jENxqmvHy9MDsxEEYgFNm7IDwq4V1VRUWy277YsvRbmEaHb+osOA5u1VNN4z3UftOZcSZgR5C/vR71cENXoPt1YQpCzu7i38ojtvL+tDVEKT7sIovrQw8q1sszNlW2nXh8RSPiIq5TMnrV73MP0egKcr9n3tfxwi1BIkLjvfom/02BkTK9R9v+VMNhYU1YwROhORCiMIgoxUGiUvtH8u38JGr7E0hhMoAjCE5k80WPUivl0=" ]; mail-server = "mail.fudo.org"; + nexus.domains = [ "fudo.link" ]; }