add buildfarm host alias

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

diff --git a/exim.org.lua b/exim.org.lua
index 1d99d41988f305b2e9b02dd5cac220ec8c542568..0f7475edecf4bd5044fa399d786d06b0342399cc 100644 (file)
--- a/exim.org.lua
+++ b/exim.org.lua
@@ -15,37 +15,26 @@ 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
+local main_ipv4 = hummus_ipv4
+local main_ipv6 = hummus_ipv6
 
 -- Standard TTL
-local ttl = 28800
+local ttl = 900
 
 -- Basic A/AAAA records
 
 local a_record_names = {
     _a, 'www', 'mail', 'ftp', 'wiki', 'lists', 'bugs',
-    'docs', 'vcs', 'git', 'dev', 'www2' }
+    'docs', 'vcs', 'git', 'dev' }
 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', 5,  ttl)
+mx(_a,              'hummus.csx.cam.ac.uk', 5,  ttl)
 mx(_a,              'boom.graemef.net', 15,     ttl)
 --
-mx('bugs',          'tahini.csx.cam.ac.uk', 5,  ttl)
+mx('bugs',          'hummus.csx.cam.ac.uk', 5,  ttl)
 
 -- Mirrors etc - A and a few CNAME records
 a('www.ie',         '193.120.14.243',           ttl)
@@ -57,8 +46,14 @@ a('www.tw',         '192.72.81.219',            ttl)
 a('www.pl',         '193.219.28.2',             ttl)
 cname('www.no',     'spheniscus.uninett.no',    ttl)
 
+-- Misc other services held elsewhere
+cname('buildfarm',  'eximfarm.krot.org',        ttl)
+
 -- Delegation of testdns.exim.org for testsuite
 ns('testdns',       'nlns.globnix.net',         ttl)
 ns('testdns',       'us0ns.globnix.net',        ttl)
 
+-- Google Gmail Postmaster Tools (this one for Phil):
+cname('nwkjs7zfnln6',  'gv-3umn6e3uwnaqo5.dv.googlehosted.com',        ttl)
+
 -- end