Skynet/nixos
6
1
Fork 0
Code Issues 43 Pull requests 1 Projects Releases Packages Wiki Activity Actions

feat: standardise dns to using `services.skynet."${name}";` format

Browse source
This commit is contained in:
silver 2024-05-30 13:25:52 +01:00
parent 75f0a17fcb
commit 023b491d89
Signed by: silver
GPG key ID: 54E2C71918E93B74
32 changed files with 76 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/bitwarden/vaultwarden.nix
View file

@ -39,7 +39,7 @@ in {
domain
];
skynet_dns.records = [
services.skynet.dns.records = [
{
record = domain_sub;
r_type = "CNAME";

91
applications/dns.nix
View file

@ -5,7 +5,8 @@
nodes,
...
}: let
cfg = config.skynet_dns;
name = "dns";
cfg = config.services.skynet."${name}";
# reads that date to a string (will need to be fixed in 2038)
current_date = lib.readFile "${pkgs.runCommand "timestamp" {} "echo -n `date +%s` > $out"}";
@ -245,10 +246,10 @@
++ builtins.concatLists (
lib.attrsets.mapAttrsToList (
key: value: let
details_server = value.config.skynet_dns.server;
details_records = value.config.skynet_dns.records;
details_server = value.config.services.skynet."${name}".server;
details_records = value.config.services.skynet."${name}".records;
in
if builtins.hasAttr "skynet_dns" value.config
if builtins.hasAttr "dns" value.config.services.skynet
then
(
# got to handle habing a dns record for the dns serves themselves.
@ -294,51 +295,49 @@ in {
../config/dns.nix
];
options = {
skynet_dns = {
server = {
enable = lib.mkEnableOption {
default = false;
description = "Skynet DNS server";
type = lib.types.bool;
};
primary = lib.mkOption {
type = lib.types.bool;
default = false;
};
ip = lib.mkOption {
type = lib.types.str;
description = ''
ip of this server
'';
};
options.services.skynet."${name}" = {
server = {
enable = lib.mkEnableOption {
default = false;
description = "Skynet DNS server";
type = lib.types.bool;
};
# mirrorred in ../config/dns.nix
records = lib.mkOption {
description = "Records, sorted based on therir type";
type = with lib.types;
listOf (submodule {
options = {
record = lib.mkOption {
type = str;
};
r_type = lib.mkOption {
type = enum ["A" "CNAME" "TXT" "PTR" "SRV" "MX"];
};
value = lib.mkOption {
type = str;
};
server = lib.mkOption {
description = "Core record for a server";
type = bool;
default = false;
};
primary = lib.mkOption {
type = lib.types.bool;
default = false;
};
ip = lib.mkOption {
type = lib.types.str;
description = ''
ip of this server
'';
};
};
# mirrorred in ../config/dns.nix
records = lib.mkOption {
description = "Records, sorted based on therir type";
type = with lib.types;
listOf (submodule {
options = {
record = lib.mkOption {
type = str;
};
});
};
r_type = lib.mkOption {
type = enum ["A" "CNAME" "TXT" "PTR" "SRV" "MX"];
};
value = lib.mkOption {
type = str;
};
server = lib.mkOption {
description = "Core record for a server";
type = bool;
default = false;
};
};
});
};
};

2
applications/email.nix
View file

@ -285,7 +285,7 @@ in {
};
# set up dns record for it
skynet_dns.records = [
services.skynet.dns.records = [
# basic one
{
record = "mail";

2
applications/games.nix
View file

@ -46,7 +46,7 @@ in {
};
config = mkIf cfg.enable {
skynet_dns.records = [
services.skynet.dns.records = [
# need a base domain
{
record = cfg.domain.sub;

2
applications/games/minecraft.nix
View file

@ -62,7 +62,7 @@ in {
"*.${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"
];
skynet_dns.records = [
services.skynet.dns.records = [
# the minecraft (web) config server
{
record = "config.${cfg.domain.sub}";

2
applications/gitlab.nix
View file

@ -106,7 +106,7 @@ in {
];
# using https://nixos.org/manual/nixos/stable/index.html#module-services-gitlab as a guide
skynet_dns.records = [
services.skynet.dns.records = [
{
record = cfg.domain.sub;
r_type = "A";

2
applications/grafana.nix
View file

@ -37,7 +37,7 @@ in {
};
config = mkIf cfg.enable {
skynet_dns.records = [
services.skynet.dns.records = [
{
record = "${name}";
r_type = "CNAME";

2
applications/ldap/backend.nix
View file

@ -60,7 +60,7 @@ in {
"${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"
];
skynet_dns.records = [
services.skynet.dns.records = [
{
record = cfg.domain.sub;
r_type = "CNAME";

2
applications/ldap/server.nix
View file

@ -83,7 +83,7 @@ in {
domain
];
skynet_dns.records = [
services.skynet.dns.records = [
{
record = cfg.domain.sub;
r_type = "CNAME";

2
applications/nextcloud.nix
View file

@ -59,7 +59,7 @@ in {
"onlyoffice.${domain}"
];
skynet_dns.records = [
services.skynet.dns.records = [
{
record = cfg.domain.sub;
r_type = "CNAME";

2
applications/nix_cache/nix_cache.nix
View file

@ -44,7 +44,7 @@ in {
"${name}.skynet.ie"
];
skynet_dns.records = [
services.skynet.dns.records = [
{
record = "${name}";
r_type = "CNAME";

2
applications/open_governance/keyserver.nix
View file

@ -33,7 +33,7 @@ in {
"${name}.skynet.ie"
];
skynet_dns.records = [
services.skynet.dns.records = [
{
record = "${name}";
r_type = "CNAME";

2
applications/open_governance/open_governance.nix
View file

@ -35,7 +35,7 @@ in {
"${name}.skynet.ie"
];
skynet_dns.records = [
services.skynet.dns.records = [
{
record = "${name}";
r_type = "CNAME";

2
applications/skynet.ie.nix
View file

@ -33,7 +33,7 @@ in {
"renew.skynet.ie"
];
skynet_dns.records = [
services.skynet.dns.records = [
# means root domain, so skynet.ie
{
record = "@";

2
applications/skynet_users.nix
View file

@ -43,7 +43,7 @@ in {
"*.users.skynet.ie"
];
skynet_dns.records = [
services.skynet.dns.records = [
{
record = "users";
r_type = "CNAME";

2
applications/ulfm.nix
View file

@ -57,7 +57,7 @@ in {
"${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"
];
skynet_dns.records = [
services.skynet.dns.records = [
{
record = cfg.domain.sub;
r_type = "CNAME";

2
machines/agentjones.nix
View file

@ -31,7 +31,7 @@ in {
tags = ["active-firewall"];
};
skynet_dns.records = [
services.skynet.dns.records = [
{
record = name;
r_type = "A";

2
machines/cadie.nix
View file

@ -31,7 +31,7 @@ in {
tags = ["active"];
};
skynet_dns.records = [
services.skynet.dns.records = [
{
record = name;
r_type = "A";

2
machines/calculon.nix
View file

@ -39,7 +39,7 @@ in {
};
# it has two network devices so two
skynet_dns.records = [
services.skynet.dns.records = [
{
record = name;
r_type = "A";

2
machines/earth.nix
View file

@ -32,7 +32,7 @@ in {
};
# it has two network devices so two
skynet_dns.records = [
services.skynet.dns.records = [
{
record = name;
r_type = "A";

2
machines/galatea.nix
View file

@ -32,7 +32,7 @@ in {
tags = ["active"];
};
skynet_dns.records = [
services.skynet.dns.records = [
{
record = name;
r_type = "A";

2
machines/gir.nix
View file

@ -33,7 +33,7 @@ in {
};
# add this server to dns
skynet_dns.records = [
services.skynet.dns.records = [
{
record = name;
r_type = "A";

2
machines/glados.nix
View file

@ -32,7 +32,7 @@ in {
tags = ["active-gitlab"];
};
skynet_dns.records = [
services.skynet.dns.records = [
{
record = name;
r_type = "A";

2
machines/kitt.nix
View file

@ -39,7 +39,7 @@ in {
};
# add this server to dns
skynet_dns.records = [
services.skynet.dns.records = [
{
record = name;
r_type = "A";

2
machines/marvin.nix
View file

@ -49,7 +49,7 @@ in {
sudo_groups = groups;
};
skynet_dns.records = [
services.skynet.dns.records = [
{
record = name;
r_type = "A";

2
machines/neuromancer.nix
View file

@ -44,7 +44,7 @@ in {
tags = ["active-core"];
};
skynet_dns.records = [
services.skynet.dns.records = [
{
record = name;
r_type = "A";

2
machines/optimus.nix
View file

@ -32,7 +32,7 @@ in {
tags = ["active"];
};
skynet_dns.records = [
services.skynet.dns.records = [
{
record = name;
r_type = "A";

2
machines/retired/ash.nix
View file

@ -39,7 +39,7 @@ in {
"ip daddr ${ip_pub} udp dport 51820 counter packets 0 bytes 0 accept"
];
skynet_dns.records = {
services.skynet.dns.records = {
external = [
"${name} A ${ip_pub}"
];

2
machines/skynet.nix
View file

@ -35,7 +35,7 @@ in {
tags = ["active-ext"];
};
skynet_dns.records = [
services.skynet.dns.records = [
{
record = name;
r_type = "A";

2
machines/vendetta.nix
View file

@ -52,7 +52,7 @@ in {
};
};
skynet_dns = {
services.skynet.dns = {
server = {
enable = true;
# primary dns server (ns1)

2
machines/vigil.nix
View file

@ -36,7 +36,7 @@ in {
};
};
skynet_dns = {
services.skynet.dns = {
server = {
enable = true;
# secondary dns server (ns2)

2
machines/wheatly.nix
View file

@ -31,7 +31,7 @@ in {
tags = ["active-gitlab"];
};
skynet_dns.records = [
services.skynet.dns.records = [
{
record = name;
r_type = "A";