hummus config; use for "newsite"

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

diff --git a/exim.org.lua b/exim.org.lua
index 12aefc71ed4a6dad1e8e5571031d1ccccacf7b02..78cda901588133378640bc26ccf4d81232f210e5 100644 (file)
--- a/exim.org.lua
+++ b/exim.org.lua
@@ -11,25 +11,29 @@
 --    .exim.org::c.ns.bytemark.co.uk:21600
 
 -- IPs we use
-local main_ipv4 = '131.111.8.192'
-local main_ipv6 = '2001:630:212:8:204:23ff:fed6:b664'
+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 = tahini_ipv4
+local main_ipv6 = tahini_ipv6
 
 -- Standard TTL
 local ttl = 28800
 
 -- 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('www2',  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
+
+a_and_aaaa('newsite', hummus_ipv4, hummus_ipv6, ttl)
+
 
 -- MX records
 mx(_a,              'tahini.csx.cam.ac.uk', 5,  ttl)
@@ -38,7 +42,6 @@ mx(_a,              'boom.graemef.net', 15,     ttl)
 mx('bugs',          'tahini.csx.cam.ac.uk', 5,  ttl)
 
 -- Mirrors etc - A and a few CNAME records
-a('www.us',         '209.58.132.254',           ttl)
 a('www.ie',         '193.120.14.243',           ttl)
 a('www.fr',         '193.54.153.246',           ttl)
 a('www.congo',      '194.7.39.155',             ttl)
@@ -47,10 +50,9 @@ 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)
-cname('www.in',     'exim.in.freeos.com',       ttl)
 
 -- Delegation of testdns.exim.org for testsuite
 ns('testdns',       'nlns.globnix.net',         ttl)
 ns('testdns',       'us0ns.globnix.net',        ttl)
 
--- end
\ No newline at end of file
+-- end