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

DNS records cleanup

Browse source
This commit is contained in:
kat witch 2021-09-01 22:35:07 +01:00
parent 9f953e7465
commit 2b9ebd8877
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
15 changed files with 135 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/modules/nixos/monitoring.nix
View file

@ -135,9 +135,9 @@ in
};
deploy.tf.dns.records.services_grafana = {
tld = config.network.dns.tld;
inherit (config.network.dns) zone;
domain = "graph";
cname.target = "${config.networking.hostName}.${config.network.dns.tld}";
cname = { inherit (config.network.addresses.public) target; };
};
services.prometheus = {

2
config/profiles/base/network.nix
View file

@ -7,7 +7,7 @@
dns = {
enable = mkDefault true;
email = "acme@kittywit.ch";
tld = "kittywit.ch.";
zone = "kittywit.ch.";
};
};
}

4
config/services/filehost/default.nix
View file

@ -10,8 +10,8 @@
};
deploy.tf.dns.records.services_filehost = {
tld = config.network.dns.tld;
inherit (config.network.dns) zone;
domain = "files";
cname.target = "${config.networking.hostName}.${config.network.dns.tld}";
cname = { inherit (config.network.addresses.public) target; };
};
}

4
config/services/fusionpbx/default.nix
View file

@ -2,9 +2,9 @@
{
deploy.tf.dns.records.services_fusionpbx = {
tld = config.network.dns.tld;
inherit (config.network.dns) zone;
domain = "pbx";
cname.target = "${config.network.addresses.private.domain}.";
cname = { inherit (config.network.addresses.private) target; };
};
kw.secrets.variables = mapListToAttrs (field:

4
config/services/gitea/default.nix
View file

@ -104,8 +104,8 @@
};
deploy.tf.dns.records.services_gitea = {
tld = config.network.dns.tld;
inherit (config.network.dns) zone;
domain = "git";
cname.target = "${config.networking.hostName}.${config.network.dns.tld}";
cname = { inherit (config.network.addresses.public) target; };
};
}

56
config/services/murmur/default.nix
View file

@ -107,35 +107,37 @@ in
# DNS
deploy.tf.dns.records.services_murmur = {
tld = config.network.dns.tld;
domain = "voice";
cname.target = "${config.networking.hostName}.${config.network.dns.tld}";
};
deploy.tf.dns.records.services_murmur_tcp_srv = {
tld = config.network.dns.tld;
domain = "@";
srv = {
service = "mumble";
proto = "tcp";
priority = 0;
weight = 5;
port = 64738;
target = "voice.${config.network.dns.tld}";
deploy.tf.dns.records = {
services_murmur = {
inherit (config.network.dns) zone;
domain = "voice";
cname = { inherit (config.network.addresses.public) target; };
};
};
deploy.tf.dns.records.services_murmur_udp_srv = {
tld = config.network.dns.tld;
domain = "@";
srv = {
service = "mumble";
proto = "udp";
priority = 0;
weight = 5;
port = 64738;
target = "voice.${config.network.dns.tld}";
services_murmur_tcp_srv = {
inherit (config.network.dns) zone;
domain = "@";
srv = {
service = "mumble";
proto = "tcp";
priority = 0;
weight = 5;
port = 64738;
target = "voice.${config.network.dns.zone}";
};
};
services_murmur_udp_srv = {
inherit (config.network.dns) zone;
domain = "@";
srv = {
service = "mumble";
proto = "udp";
priority = 0;
weight = 5;
port = 64738;
target = "voice.${config.network.dns.zone}";
};
};
};
}

4
config/services/radicale/default.nix
View file

@ -36,8 +36,8 @@ with lib;
};
deploy.tf.dns.records.services_radicale = {
tld = config.network.dns.tld;
inherit (config.network.dns) zone;
domain = "cal";
cname.target = "${config.networking.hostName}.${config.network.dns.tld}";
cname = { inherit (config.network.addresses.public) target; };
};
}

4
config/services/syncplay/default.nix
View file

@ -33,9 +33,9 @@ with lib;
};
deploy.tf.dns.records.services_syncplay = {
tld = config.network.dns.tld;
inherit (config.network.dns) zone;
domain = "sync";
cname.target = "${config.networking.hostName}.${config.network.dns.tld}";
cname = { inherit (config.network.addresses.public) target; };
};
secrets.files.syncplay-env = {

4
config/services/vaultwarden/default.nix
View file

@ -53,8 +53,8 @@
};
deploy.tf.dns.records.services_vaultwarden = {
tld = config.network.dns.tld;
inherit (config.network.dns) zone;
domain = "vault";
cname.target = "${config.networking.hostName}.${config.network.dns.tld}";
cname = { inherit (config.network.addresses.public) target; };
};
}

4
config/services/weechat/default.nix
View file

@ -14,8 +14,8 @@
};
deploy.tf.dns.records.services_weechat = {
tld = config.network.dns.tld;
inherit (config.network.dns) zone;
domain = "irc";
cname.target = "${config.networking.hostName}.${config.network.dns.tld}";
cname = { inherit (config.network.addresses.public) target; };
};
}

147
config/services/xmpp/default.nix
View file

@ -3,7 +3,16 @@
with lib;
{
network.firewall.public.tcp.ports = [ 5000 5222 5223 5269 580 5281 5347 5582 ];
network.firewall.public.tcp.ports = [
5000
5222
5223
5269
5280
5281
5347
5582
];
services.postgresql = {
ensureDatabases = [ "prosody" ];
@ -56,79 +65,81 @@ with lib;
[ config.network.dns.domain "upload.${config.network.dns.domain}" "conference.${config.network.dns.domain}" ];
};
deploy.tf.dns.records.services_prosody_xmpp = {
tld = config.network.dns.tld;
domain = "xmpp";
a.address = config.network.addresses.public.nixos.ipv4.address;
};
deploy.tf.dns.records.services_prosody_xmpp_v6 = {
tld = config.network.dns.tld;
domain = "xmpp";
aaaa.address = config.network.addresses.public.nixos.ipv6.address;
};
deploy.tf.dns.records.services_prosody_upload = {
tld = config.network.dns.tld;
domain = "upload";
cname.target = "xmpp.${config.network.dns.tld}";
};
deploy.tf.dns.records.services_prosody_conference = {
tld = config.network.dns.tld;
domain = "conference";
cname.target = "xmpp.${config.network.dns.tld}";
};
deploy.tf.dns.records.services_prosody_muc = {
tld = config.network.dns.tld;
domain = "conference";
srv = {
service = "xmpp-server";
proto = "tcp";
priority = 0;
weight = 5;
port = 5269;
target = "xmpp.${config.network.dns.tld}";
deploy.tf.dns.records = {
services_prosody_xmpp = {
inherit (config.network.dns) zone;
domain = "xmpp";
a.address = config.network.addresses.public.nixos.ipv4.address;
};
};
deploy.tf.dns.records.services_prosody_client_srv = {
tld = config.network.dns.tld;
domain = "@";
srv = {
service = "xmpp-client";
proto = "tcp";
priority = 0;
weight = 5;
port = 5222;
target = "xmpp.${config.network.dns.tld}";
services_prosody_xmpp_v6 = {
inherit (config.network.dns) zone;
domain = "xmpp";
aaaa.address = config.network.addresses.public.nixos.ipv6.address;
};
};
deploy.tf.dns.records.services_prosody_secure_client_srv = {
tld = config.network.dns.tld;
domain = "@";
srv = {
service = "xmpps-client";
proto = "tcp";
priority = 0;
weight = 5;
port = 5223;
target = "xmpp.${config.network.dns.tld}";
services_prosody_upload = {
inherit (config.network.dns) zone;
domain = "upload";
cname.target = "xmpp.${config.network.dns.zone}";
};
};
deploy.tf.dns.records.services_prosody_server_srv = {
tld = config.network.dns.tld;
domain = "@";
srv = {
service = "xmpp-server";
proto = "tcp";
priority = 0;
weight = 5;
port = 5269;
target = "xmpp.${config.network.dns.tld}";
services_prosody_conference = {
inherit (config.network.dns) zone;
domain = "conference";
cname.target = "xmpp.${config.network.dns.zone}";
};
services_prosody_muc = {
inherit (config.network.dns) zone;
domain = "conference";
srv = {
service = "xmpp-server";
proto = "tcp";
priority = 0;
weight = 5;
port = 5269;
target = "xmpp.${config.network.dns.zone}";
};
};
services_prosody_client_srv = {
inherit (config.network.dns) zone;
domain = "@";
srv = {
service = "xmpp-client";
proto = "tcp";
priority = 0;
weight = 5;
port = 5222;
target = "xmpp.${config.network.dns.zone}";
};
};
services_prosody_secure_client_srv = {
inherit (config.network.dns) zone;
domain = "@";
srv = {
service = "xmpps-client";
proto = "tcp";
priority = 0;
weight = 5;
port = 5223;
target = "xmpp.${config.network.dns.zone}";
};
};
services_prosody_server_srv = {
inherit (config.network.dns) zone;
domain = "@";
srv = {
service = "xmpp-server";
proto = "tcp";
priority = 0;
weight = 5;
port = 5269;
target = "xmpp.${config.network.dns.zone}";
};
};
};

4
config/services/znc/default.nix
View file

@ -122,9 +122,9 @@ in
};
deploy.tf.dns.records.services_znc = {
tld = config.network.dns.tld;
inherit (config.network.dns) zone;
domain = "znc";
cname.target = "${config.networking.hostName}.${config.network.dns.tld}";
cname = { inherit (config.network.addresses.public) target; };
};
services.znc = {

6
config/targets/common/default.nix
View file

@ -1,4 +1,4 @@
{ config, ... }:
{ config, lib, ... }: with lib;
{
variables.katdns-address = {
@ -27,5 +27,7 @@
};
};
dns.zones."kittywit.ch." = { provider = "dns.katdns"; };
dns.zones = genAttrs ["kittywit.ch." "dork.dev."] (_: {
provider = "dns.katdns";
});
}

4
config/targets/home/default.nix
View file

@ -4,13 +4,13 @@
deploy.targets.home = {
tf = { config, ... }: {
dns.records.ygg_grimoire = {
tld = "kittywit.ch.";
zone = "kittywit.ch.";
domain = "grimoire.ygg";
aaaa.address = "200:c87d:7960:916:bf0e:a0e1:3da7:4fc6";
};
dns.records.ygg_boline = {
tld = "kittywit.ch.";
zone = "kittywit.ch.";
domain = "boline.ygg";
aaaa.address = "200:474d:14f7:1d21:f171:4e85:a3fa:9393";
};

4
config/targets/rinnosuke-domains/default.nix
View file

@ -4,12 +4,12 @@ let rinnosuke = config.network.nodes.rinnosuke; in {
deploy.targets.rinnosuke-domains.tf = {
dns.records = {
node_public_rinnosuke_v4 = {
tld = rinnosuke.network.dns.tld;
inherit (rinnosuke.network.dns) zone;
domain = rinnosuke.networking.hostName;
a.address = rinnosuke.network.addresses.public.nixos.ipv4.address;
};
node_public_rinnosuke_v6 = {
tld = rinnosuke.network.dns.tld;
inherit (rinnosuke.network.dns) zone;
domain = rinnosuke.networking.hostName;
aaaa.address = rinnosuke.network.addresses.public.nixos.ipv6.address;
};