nix/lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No pubsub for now.

Browse Source
This commit is contained in:
niten 2022-01-06 21:49:31 -08:00
parent 9adef243c8
commit ffbe3656ec
2 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/fudo/jabber.nix
View File

@ -213,8 +213,7 @@ in {
acme.host-domains.${hostname} = mapAttrs' (site: siteOpts: acme.host-domains.${hostname} = mapAttrs' (site: siteOpts:
nameValuePair siteOpts.hostname { nameValuePair siteOpts.hostname {
extra-domains = extra-domains =
(optional (siteOpts.hostname != host-fqdn) host-fqdn) ++ (optional (siteOpts.hostname != host-fqdn) host-fqdn);
[ "pubsub.${site}" ];
local-copies.ejabberd = { local-copies.ejabberd = {
user = cfg.user; user = cfg.user;
group = cfg.group; group = cfg.group;

42
lib/lib/dns.nix
View File

@ -75,7 +75,7 @@ let
a-record = host: hostOpts: optional (hostOpts.ipv4-address != null) a-record = host: hostOpts: optional (hostOpts.ipv4-address != null)
"${host} IN A ${hostOpts.ipv4-address}"; "${host} IN A ${hostOpts.ipv4-address}";
aaaa-record = host: hostOpts: optional (hostOpts.ipv6-address != null) aaaa-record = host: hostOpts: optional (hostOpts.ipv6-address != null)
"${host} IN A ${hostOpts.ipv6-address}"; "${host} IN AAAA ${hostOpts.ipv6-address}";
description-record = host: hostOpts: optional (hostOpts.description != null) description-record = host: hostOpts: optional (hostOpts.description != null)
''${host} IN TXT "${hostOpts.description}"''; ''${host} IN TXT "${hostOpts.description}"'';
in flatmapAttrsToList in flatmapAttrsToList
@ -97,27 +97,61 @@ let
$ORIGIN ${dom}. $ORIGIN ${dom}.
$TTL ${zone.default-ttl} $TTL ${zone.default-ttl}
###
# Default Host
###
${optionalString (zone.default-host != null) ${optionalString (zone.default-host != null)
"@ IN A ${zone.default-host}"} "@ IN A ${zone.default-host}"}
###
# MX Records
###
${join-lines (mxRecords zone.mx)} ${join-lines (mxRecords zone.mx)}
# dmarc
${dmarcRecord zone.dmarc-report-address}
###
# Kerberos Realm
###
${optionalString (zone.gssapi-realm != null) ${optionalString (zone.gssapi-realm != null)
''_kerberos IN TXT "${zone.gssapi-realm}"''} ''_kerberos IN TXT "${zone.gssapi-realm}"''}
$TTL ${zone.host-record-ttl} ###
# Nameservers
###
${join-lines (nsRecords dom zone.nameservers)} ${join-lines (nsRecords dom zone.nameservers)}
${join-lines (nsARecords dom zone.nameservers)} ${join-lines (nsARecords dom zone.nameservers)}
${dmarcRecord zone.dmarc-report-address} ###
# General Records
###
$TTL ${zone.host-record-ttl}
###
# SRV Records
###
${join-lines (mapAttrsToList makeSrvProtocolRecords zone.srv-records)} ${join-lines (mapAttrsToList makeSrvProtocolRecords zone.srv-records)}
###
# Host Records
###
${join-lines (mapAttrsToList hostRecords zone.hosts)} ${join-lines (mapAttrsToList hostRecords zone.hosts)}
###
# CNAMEs
###
${join-lines (mapAttrsToList cnameRecord zone.aliases)} ${join-lines (mapAttrsToList cnameRecord zone.aliases)}
###
# Verbatim Records
###
${join-lines zone.verbatim-dns-records} ${join-lines zone.verbatim-dns-records}
###
# Subdomains of ${dom}
###
${join-lines (mapAttrsToList ${join-lines (mapAttrsToList
(subdom: subdomCfg: subdomain-record "${subdom}.${dom}" subdomCfg) (subdom: subdomCfg: subdomain-record "${subdom}.${dom}" subdomCfg)
zone.subdomains)} zone.subdomains)}