New UCW config.

diff --git a/cf.ucw/128-143.5.31.81 b/cf.ucw/128-143.5.31.81
index 58045ee75984f289276da7587b7fa639ae9e14bf..d81eb8a2a7ef1fe15c87ed9fc62bd5094a714cd1 100644 (file)
--- a/cf.ucw/128-143.5.31.81
+++ b/cf.ucw/128-143.5.31.81
@@ -1,4 +1,4 @@
 SOA(REV(81.31.5.128-143))
-NS(jabberwock.ucw.cz,cs.cecom.cz,cm.cecom.cz)
+NS(jabberwock.ucw.cz, server1.trestel.cz, server2.trestel.cz)
 
 REVERSE(81.31.5, 128, 143)

diff --git a/cf.ucw/config b/cf.ucw/config
index 1a4b87e46a89b7226068c72c4f77b10a83760b37..cbc8f4524c2a766eb0687dec9f89e728104ad6b8 100644 (file)
--- a/cf.ucw/config
+++ b/cf.ucw/config
@@ -1 +1,6 @@
 ; User configuration of the NSC
+
+define(`NAMED_RESTART_CMD', `rndc reload')
+
+define(`jabip', `89.250.246.4')
+define(`ucwmx', `0 jabberwock')

diff --git a/cf.ucw/domains b/cf.ucw/domains
index dd453b122245218f11194ccc7914e3b1d23cad7b..9e39c20dbb5bf4b9f1ebbfdadb5d50cb7cd5ff7a 100644 (file)
--- a/cf.ucw/domains
+++ b/cf.ucw/domains
@@ -8,17 +8,11 @@ REVERSE(127.0.0, localhost)
 
 PRIMARY(ucw.cz)
 REVERSE(81.31.5.128-143, ucw.cz)
+REVERSE(89.250.246.0-15, ucw.cz)
 PRIMARY(slady.cz)
-PRIMARY(slady.net)
 PRIMARY(pdesign.cz)
 PRIMARY(martin.mares.name)
+PRIMARY(anicka.net)
 
-SECONDARY(werewolf.cz,194.108.93.231)
-SECONDARY(mks.cz,212.71.128.78)
-SECONDARY(resla.cz,212.71.128.78)
 SECONDARY(sebald-flex.cz,212.71.128.78)
-SECONDARY(bepof.cz,212.71.128.78)
-SECONDARY(cheb.cz,212.71.128.78)
-SECONDARY(egraphics.cz,212.71.128.78)
-SECONDARY(chytej.cz,212.71.128.78)
 SECONDARY(drak.ucw.cz,212.71.128.78)

diff --git a/cf.ucw/martin.mares.name b/cf.ucw/martin.mares.name
index 3e9d48a550ce3cd1480890e187e23b04668e5535..d84e86abff746e56a207a5e4b0c46e4f04fa6ddd 100644 (file)
--- a/cf.ucw/martin.mares.name
+++ b/cf.ucw/martin.mares.name
@@ -1,4 +1,4 @@
 SOA(martin.mares.name)
 NS(jabberwock.ucw.cz,drak.ucw.cz)
 MX(0 jabberwock.ucw.cz)
-DADDR(81.31.5.130)
+DADDR(jabip)

diff --git a/cf.ucw/pdesign.cz b/cf.ucw/pdesign.cz
index e92b71bf4498962ea632792dce60d93d2f7afc15..34f56dc6b10ebe9437aa05aab026a5f5c03592db 100644 (file)
--- a/cf.ucw/pdesign.cz
+++ b/cf.ucw/pdesign.cz
@@ -1,6 +1,6 @@
 SOA(pdesign.cz)
 NS(jabberwock.ucw.cz,drak.ucw.cz)
 MX(0 jabberwock.ucw.cz)
-DADDR(81.31.5.130)
+DADDR(jabip)
 
-DH(www, 81.31.5.130)
+DH(www, jabip)

diff --git a/cf.ucw/slady.cz b/cf.ucw/slady.cz
index a4aa46c4f94ac7f6a05ca8bd8c853bab1ee76605..b1343cacdf282039d347718f4bc007d0c22f94e2 100644 (file)
--- a/cf.ucw/slady.cz
+++ b/cf.ucw/slady.cz
@@ -1,6 +1,6 @@
 SOA(slady.cz)
 NS(jabberwock.ucw.cz,drak.ucw.cz)
 MX(0 jabberwock.ucw.cz)
-DADDR(81.31.5.130)
+DADDR(jabip)
 
-DH(www, 81.31.5.130)
+DH(www, jabip)

diff --git a/cf.ucw/slady.net b/cf.ucw/slady.net
deleted file mode 100644 (file)
index 4942b4b..0000000
--- a/cf.ucw/slady.net
+++ /dev/null
@@ -1,6 +0,0 @@
-SOA(slady.net)
-NS(jabberwock.ucw.cz,drak.ucw.cz)
-MX(0 jabberwock.ucw.cz)
-DADDR(81.31.5.130)
-
-DH(www, 81.31.5.130)

diff --git a/cf.ucw/ucw.cz b/cf.ucw/ucw.cz
index eb72dcda076d9d3fcadaf296811f07b3b5d8a794..3fdc73f1b8c75b182295f3c6a1949d4024bc95a3 100644 (file)
--- a/cf.ucw/ucw.cz
+++ b/cf.ucw/ucw.cz
@@ -1,8 +1,5 @@
 ; Domain file for ucw.cz by MJ
 
-define(`jabip', `81.31.5.130')
-define(`ucwmx', `0 jabberwock')
-
 SOA(ucw.cz)
 NS(jabberwock.ucw.cz,drak.ucw.cz,ns.parcon.cz)
 MX(ucwmx, 10 drak)
@@ -11,31 +8,32 @@ DADDR(jabip)
 ; Jabberwock, connected to CECOM
 H(jabberwock, jabip)
 MX(ucwmx)
-ALIAS(lariat,www,ftp,vrr,cvs)
+ALIAS(www, ftp, cvs, git, mbox, smtp)
+ALIAS(vrr, pci-ids)
+ALIAS(mj)
+ALIAS(sechtl-vosecek, 3color)
+ALIAS(tanahonza)
 
-; MJ's home network
-H(albireo, 81.27.194.19)
-MX(ucwmx)
+; IP space routed to Jabberwock: 0-15
+; Firewall traversal service
+H(iceberg, 89.250.246.5)
 
-the.name.of.my.computer.is.longer.than.the.name.of.your.computers.isnt.it      `CNAME' albireo
+; Old IP address of Jabberwock
+H(jw-old, 81.31.5.130)
 
-; Pavel <pavel@ucw.cz>
-H(elf)
+; MJ's home network
+H(albireo, 84.242.87.5)
 MX(ucwmx)
 
-H(bug)
-MX(ucwmx)
+H(bearpaw, 88.208.93.65)
 
-; Dan <0rfelyus@ucw.cz>
-H(hobitin)
-MX(ucwmx)
-CNAME(stopari, jabberwock)
+D(burrow)
+NS(albireo)
 
-; Vojta <vojtech@ucw.cz>
-H(twilight, 81.30.235.3)
-MX(0 twilight.ucw.cz, 10 twilight-upc.ucw.cz, 100 jabberwock.ucw.cz)
+the.name.of.my.computer.is.longer.than.the.name.of.your.computers.isnt.it      `CNAME' albireo
 
-H(twilight-upc, 62.245.75.237)
+; Vojta <vojtech@ucw.cz>
+CNAME(twilight, s254.chello.upc.cz)
 
 DH(m-v, jabip)
 MX(ucwmx)
@@ -44,16 +42,27 @@ ALIAS(www.m-v)
 DH(lakarie, jabip)
 MX(ucwmx)
 
-; Erik Hamera <hamerae@cs.felk.cvut.cz>
-H(kanal, 62.24.67.123)
-MX(0 kanal)
-H(mamutik, 62.24.67.72)
+; Dan <0rfelyus@ucw.cz>
+H(hobitin)
+MX(ucwmx)
+CNAME(stopari, jabberwock)
+
+; Tom Valla <tom@ucw.cz>
+H(hal9000, 193.165.12.73)
+
+; Erik Hamera <hamerae@cs.felk.cvut.cz> <yokotashi@mailcan.com>
+CNAME(kanal, rattus.mine.nu)
+H(mamutik, 213.220.221.244)
 
 ; Johanka <johanka@ucw.cz>
 H(arc, 195.39.17.251)
+CNAME(mad, jabberwock)
 
 ; Mafi <mafi@ucw.cz>
-CNAME(mafi, ns1.foo.cz)
+CNAME(mafi, mafi.tucnacek.org)
+
+; Radek Doulik <rodo@ucw.cz>, old web site
+CNAME(rodo, jabberwock)
 
 ; Drak <goran@ucw.cz>
 ; (we're a secondary for Drak, so glue record is not needed)