Missed the MX updates

[exim-dns.git] / exim.org.lua

diff --git a/exim.org.lua b/exim.org.lua
index f77068f287ce78ddcc0578dd54012e496b9dbda8..405553892c45b4f61062426560cceb3ee861ff16 100644 (file)
--- a/exim.org.lua
+++ b/exim.org.lua
@@ -11,46 +11,54 @@
 --    .exim.org::c.ns.bytemark.co.uk:21600
 
 -- IPs we use
-local main_ipv4 = '131.111.8.192'
-local main_ipv6 = '2001063002120008020423fffed6b664'
+local tahini_ipv4 = '131.111.8.192'
+local tahini_ipv6 = '2001:630:212:8:204:23ff:fed6:b664'
+local hummus_ipv4 = '131.111.8.88'
+local hummus_ipv6 = '2001:630:212:8::e:f0e'
+local main_ipv4 = hummus_ipv4
+local main_ipv6 = hummus_ipv6
 
 -- Standard TTL
-local ttl = 7200
+local ttl = 900
 
 -- Basic A/AAAA records
-a_and_aaaa(_a,      main_ipv4, main_ipv6, ttl)
-a_and_aaaa('www',   main_ipv4, main_ipv6, ttl)
-a_and_aaaa('mail',  main_ipv4, main_ipv6, ttl)
-a_and_aaaa('ftp',   main_ipv4, main_ipv6, ttl)
-a_and_aaaa('wiki',  main_ipv4, main_ipv6, ttl)
-a_and_aaaa('lists', main_ipv4, main_ipv6, ttl)
-a_and_aaaa('bugs',  main_ipv4, main_ipv6, ttl)
-a_and_aaaa('docs',  main_ipv4, main_ipv6, ttl)
-a_and_aaaa('vcs',   main_ipv4, main_ipv6, ttl)
-a_and_aaaa('git',   main_ipv4, main_ipv6, ttl)
-a_and_aaaa('dev',   main_ipv4, main_ipv6, ttl)
-a_and_aaaa('mail',  main_ipv4, main_ipv6, ttl)
-a_and_aaaa('mail',  main_ipv4, main_ipv6, ttl)
-a_and_aaaa('mail',  main_ipv4, main_ipv6, ttl)
-a_and_aaaa('mail',  main_ipv4, main_ipv6, ttl)
-a_and_aaaa('mail',  main_ipv4, main_ipv6, ttl)
+
+local a_record_names = {
+    _a, 'www', 'mail', 'ftp', 'wiki', 'lists', 'bugs',
+    'docs', 'vcs', 'git', 'dev', 'www2' }
+for val in values(a_record_names) do
+    a_and_aaaa(val, main_ipv4, main_ipv6,       ttl)
+end
+
+-- Server transition
+
+local newsite_record_names = {
+    'newsite',
+    'n-vcs', 'n-docs', 'n-git', 'n-dev', 'n-wiki', 'n-lists', 'n-bugs', 'n-ftp',
+    'n-www' }
+for val in values(newsite_record_names) do
+    a_and_aaaa(val, hummus_ipv4, hummus_ipv6, ttl)
+end
+
 
 -- MX records
-mx(_a,'tahini.csx.cam.ac.uk', ttl)
-mx(_a,'boom.graemef.net', ttl)
+mx(_a,              'hummus.csx.cam.ac.uk', 5,  ttl)
+mx(_a,              'boom.graemef.net', 15,     ttl)
 --
-mx('bugs','tahini.csx.cam.ac.uk', ttl)
+mx('bugs',          'hummus.csx.cam.ac.uk', 5,  ttl)
 
 -- Mirrors etc - A and a few CNAME records
-a(concat('www.us', _a),     '209.58.132.254',  ttl)
-a(concat('www.ie', _a),     '193.120.14.243',  ttl)
-a(concat('www.fr', _a),     '193.54.153.246',  ttl)
-a(concat('www.congo', _a),  '194.7.39.155',    ttl)
-a(concat('ftp.de', _a),     '195.211.161.101', ttl)
-a(concat('www.de', _a),     '195.211.161.101', ttl)
-a(concat('www.tw', _a),     '192.72.81.219',   ttl)
-a(concat('www.pl', _a),     '193.219.28.2',    ttl)
-cname(concat('www.no', _a), 'spheniscus.uninett.no', ttl)
-cname(concat('www.in', _a), 'exim.in.freeos.com',    ttl)
-
--- end
\ No newline at end of file
+a('www.ie',         '193.120.14.243',           ttl)
+a('www.fr',         '193.54.153.246',           ttl)
+a('www.congo',      '194.7.39.155',             ttl)
+a('ftp.de',         '195.211.161.101',          ttl)
+a('www.de',         '195.211.161.101',          ttl)
+a('www.tw',         '192.72.81.219',            ttl)
+a('www.pl',         '193.219.28.2',             ttl)
+cname('www.no',     'spheniscus.uninett.no',    ttl)
+
+-- Delegation of testdns.exim.org for testsuite
+ns('testdns',       'nlns.globnix.net',         ttl)
+ns('testdns',       'us0ns.globnix.net',        ttl)
+
+-- end