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

Reverting the ";" near the first half of the file that end up in the DNS config file, that do not actually get parsed by NIX.

Browse source
This commit is contained in:
pio 2023-10-22 22:07:58 +00:00
parent bbe81fcd3e
commit 38e0eada72
1 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

92
applications/dns.nix
View file

@ -47,55 +47,55 @@
# base config for domains we own (skynet.ie, csn.ul.ie, ulcompsoc.ie) # base config for domains we own (skynet.ie, csn.ul.ie, ulcompsoc.ie)
get_config_file = ( get_config_file = (
domain: '' domain: ''
$TTL 60 # 1 minute $TTL 60 ; 1 minute
# hostmaster@${domain} is an email address that recieves stuff related to dns ; hostmaster@${domain} is an email address that recieves stuff related to dns
@ IN SOA ${nameserver}.${domain}. hostmaster.${domain}. ( @ IN SOA ${nameserver}.${domain}. hostmaster.${domain}. (
# Serial (YYYYMMDDCC) this has to be updated for each time the record is updated ; Serial (YYYYMMDDCC) this has to be updated for each time the record is updated
${current_date} ${current_date}
600 # Refresh (10 minutes) 600 ; Refresh (10 minutes)
300 # Retry (5 minutes) 300 ; Retry (5 minutes)
604800 # Expire (1 week) 604800 ; Expire (1 week)
3600 # Minimum (1 hour) 3600 ; Minimum (1 hour)
) )
@ NS ns1.${domain}. @ NS ns1.${domain}.
@ NS ns2.${domain}. @ NS ns2.${domain}.
# @ stands for the root domain so the A record below is where ${domain} points to ; @ stands for the root domain so the A record below is where ${domain} points to
#@ A 193.1.99.76 ;@ A 193.1.99.76
#@ MX 5 ${domain}. ;@ MX 5 ${domain}.
# can have multiple mailserves ; can have multiple mailserves
@ MX 10 mail.${domain}. @ MX 10 mail.${domain}.
# ------------------------------------------ ; ------------------------------------------
# Server Names (A Records) ; Server Names (A Records)
# ------------------------------------------ ; ------------------------------------------
${format_records sort_records_server 31} ${format_records sort_records_server 31}
# ------------------------------------------ ; ------------------------------------------
# A (non server names) ; A (non server names)
# ------------------------------------------ ; ------------------------------------------
${format_records sort_records_a 31} ${format_records sort_records_a 31}
# ------------------------------------------ ; ------------------------------------------
# CNAMES ; CNAMES
# ------------------------------------------ ; ------------------------------------------
${format_records sort_records_cname 31} ${format_records sort_records_cname 31}
# ------------------------------------------ ; ------------------------------------------
# TXT ; TXT
# ------------------------------------------ ; ------------------------------------------
${format_records (filter_records_type "TXT") 31} ${format_records (filter_records_type "TXT") 31}
# ------------------------------------------ ; ------------------------------------------
# MX ; MX
# ------------------------------------------ ; ------------------------------------------
${format_records (filter_records_type "MX") 31} ${format_records (filter_records_type "MX") 31}
# ------------------------------------------ ; ------------------------------------------
# SRV ; SRV
# ------------------------------------------ ; ------------------------------------------
${format_records sort_records_srv 31} ${format_records sort_records_srv 31}
@ -107,23 +107,23 @@
get_config_file_rev = ( get_config_file_rev = (
domain: '' domain: ''
$ORIGIN 64-64.99.1.193.in-addr.arpa. $ORIGIN 64-64.99.1.193.in-addr.arpa.
$TTL 60 # 1 minute $TTL 60 ; 1 minute
# hostmaster@skynet.ie is an email address that recieves stuff related to dns ; hostmaster@skynet.ie is an email address that recieves stuff related to dns
@ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. ( @ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. (
# Serial (YYYYMMDDCC) this has to be updated for each time the record is updated ; Serial (YYYYMMDDCC) this has to be updated for each time the record is updated
${current_date} ${current_date}
600 # Refresh (10 minutes) 600 ; Refresh (10 minutes)
300 # Retry (5 minutes) 300 ; Retry (5 minutes)
604800 # Expire (1 week) 604800 ; Expire (1 week)
3600 # Minimum (1 hour) 3600 ; Minimum (1 hour)
) )
@ NS ns1.skynet.ie. @ NS ns1.skynet.ie.
@ NS ns2.skynet.ie. @ NS ns2.skynet.ie.
# ------------------------------------------ ; ------------------------------------------
# PTR ; PTR
# ------------------------------------------ ; ------------------------------------------
${format_records sort_records_ptr 3} ${format_records sort_records_ptr 3}
'' ''
); );
@ -131,15 +131,15 @@
# domains we dont have proper ownership over, only here to ensure the logs dont get cluttered. # domains we dont have proper ownership over, only here to ensure the logs dont get cluttered.
get_config_file_old_domains = ( get_config_file_old_domains = (
domain: '' domain: ''
$TTL 60 # 1 minute $TTL 60 ; 1 minute
# hostmaster@skynet.ie is an email address that recieves stuff related to dns ; hostmaster@skynet.ie is an email address that recieves stuff related to dns
@ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. ( @ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. (
# Serial (YYYYMMDDCC) this has to be updated for each time the record is updated ; Serial (YYYYMMDDCC) this has to be updated for each time the record is updated
${current_date} ${current_date}
600 # Refresh (10 minutes) 600 ; Refresh (10 minutes)
300 # Retry (5 minutes) 300 ; Retry (5 minutes)
604800 # Expire (1 week) 604800 ; Expire (1 week)
3600 # Minimum (1 hour) 3600 ; Minimum (1 hour)
) )
@ NS ns1.skynet.ie. @ NS ns1.skynet.ie.