gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

network: Fix domain creation for TF provisioned hosts.

Browse source
This commit is contained in:
kat witch 2021-09-07 05:05:17 +01:00
parent 674ec2efd4
commit 0c17f85fc8
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
5 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/profiles/network.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, ... }: with lib;
{
options.network = with lib; {

2
config/services/knot/default.nix
View file

@ -1,6 +1,8 @@
{ config, lib, tf, pkgs, ... }:
{
network.dns.enable = false;
kw.secrets.variables = {
katdns-key-config = {
path = "secrets/katdns";

15
config/targets/rinnosuke-domains.nix
View file

@ -14,6 +14,21 @@ let rinnosuke = config.network.nodes.rinnosuke; in
domain = rinnosuke.networking.hostName;
aaaa.address = rinnosuke.network.addresses.public.nixos.ipv6.address;
};
node_wireguard_rinnosuke_v4 = {
inherit (rinnosuke.network.dns) zone;
domain = rinnosuke.network.addresses.wireguard.subdomain;
a.address = rinnosuke.network.addresses.wireguard.nixos.ipv4.address;
};
node_wireguard_rinnosuke_v6 = {
inherit (rinnosuke.network.dns) zone;
domain = rinnosuke.network.addresses.wireguard.subdomain;
aaaa.address = rinnosuke.network.addresses.wireguard.nixos.ipv6.address;
};
node_yggdrasil_rinnosuke_v6 = {
inherit (rinnosuke.network.dns) zone;
domain = rinnosuke.network.addresses.yggdrasil.subdomain;
aaaa.address = rinnosuke.network.addresses.yggdrasil.nixos.ipv6.address;
};
};
};
}

6
nix/sources.json
View file

@ -89,10 +89,10 @@
"homepage": null,
"owner": "kittywitch",
"repo": "nixexprs",
"rev": "0dc07928ed3c26100c3fe8e6de22af7259cebbad",
"sha256": "0h8x0d1fq9rbndds87aa4zjy5ccdvjwx1zmylqdrp9223vynnbb6",
"rev": "4d6613a56184318e7a4dc845a1d641a8e9daa6f1",
"sha256": "0rs7vm5yh0myq1hhycsrpwxrvysy721zj9i9gy1s37bwgcdyvhml",
"type": "tarball",
"url": "https://github.com/kittywitch/nixexprs/archive/0dc07928ed3c26100c3fe8e6de22af7259cebbad.tar.gz",
"url": "https://github.com/kittywitch/nixexprs/archive/4d6613a56184318e7a4dc845a1d641a8e9daa6f1.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"niv": {

2
overlays/exprs

@ -1 +1 @@
Subproject commit 0dc07928ed3c26100c3fe8e6de22af7259cebbad
Subproject commit 4d6613a56184318e7a4dc845a1d641a8e9daa6f1