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

Merge branch '#52-dns-for-non-nixos' into 'main'

Browse source 
feat: Added functionality to have dns for non nixos servers

Closes #52

See merge request compsoc1/skynet/nixos!30
This commit is contained in:
silver 2024-01-27 19:05:55 +00:00
commit 24018b5400
2 changed files with 92 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
applications/dns.nix
View file

@ -240,47 +240,49 @@
old = "";
};
records = builtins.concatLists (
lib.attrsets.mapAttrsToList (
key: value: let
details_server = value.config.skynet_dns.server;
details_records = value.config.skynet_dns.records;
in
if builtins.hasAttr "skynet_dns" value.config
then
(
# got to handle habing a dns record for the dns serves themselves.
if details_server.enable
then
(
if details_server.primary
then
details_records
++ [
{
record = "ns1";
r_type = "A";
value = details_server.ip;
server = false;
}
]
else
details_records
++ [
{
record = "ns2";
r_type = "A";
value = details_server.ip;
server = false;
}
]
)
else details_records
)
else []
)
nodes
);
records =
config.skynet.records
++ builtins.concatLists (
lib.attrsets.mapAttrsToList (
key: value: let
details_server = value.config.skynet_dns.server;
details_records = value.config.skynet_dns.records;
in
if builtins.hasAttr "skynet_dns" value.config
then
(
# got to handle habing a dns record for the dns serves themselves.
if details_server.enable
then
(
if details_server.primary
then
details_records
++ [
{
record = "ns1";
r_type = "A";
value = details_server.ip;
server = false;
}
]
else
details_records
++ [
{
record = "ns2";
r_type = "A";
value = details_server.ip;
server = false;
}
]
)
else details_records
)
else []
)
nodes
);
nameserver =
if cfg.server.primary
@ -288,7 +290,8 @@
else "ns2";
in {
imports = [
../applications/firewall.nix
./firewall.nix
../config/dns.nix
];
options = {
@ -313,6 +316,7 @@ in {
};
};
# mirrorred in ../config/dns.nix
records = lib.mkOption {
description = "Records, sorted based on therir type";
type = with lib.types;

46
config/dns.nix Normal file
View file

@ -0,0 +1,46 @@
{lib, ...}: {
imports = [
# Paths to other modules.
# Compose this module out of smaller ones.
];
# this needs to mirror ../applications/dns.nix
options.skynet.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;
};
};
});
};
config = {
skynet.records = [
#{
# record = "bumblebee";
# r_type = "A";
# value = "193.1.99.91";
# server = true;
#}
#{
# record = "testing";
# r_type = "CNAME";
# value = "bumblebee";
#}
];
};
}