From 8b4689b24cef5f94e81c0f30e281a84701a0f253 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 17 Nov 2008 22:06:51 +0000
Subject: Add BITBASE domain friis-holm.dk, drop haakansson.com and
 *.borneuni.dk.

---
 amavis/local_domains    | 2 +-
 amavis/nonlocal_domains | 8 ++++++++
 bind/named.conf.pri     | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/amavis/local_domains b/amavis/local_domains
index fb2d7fb..e9dd3e2 100644
--- a/amavis/local_domains
+++ b/amavis/local_domains
@@ -1,5 +1,5 @@
 bitbase.dk
-borneuni.dk
+friis-holm.dk
 himawari.dk
 lists.jones.dk
 redpill.dk
diff --git a/amavis/nonlocal_domains b/amavis/nonlocal_domains
index b63481e..ac68e6a 100644
--- a/amavis/nonlocal_domains
+++ b/amavis/nonlocal_domains
@@ -1,9 +1,13 @@
 107b.dk
+adm.borneuni.dk
 annikalewis.dk
 anniqa.dk
 bassballs.dk
+bestyrelse.borneuni.dk
+borneuni.dk
 dgi-huset.dk
 dgihuset.dk
+elev.borneuni.dk
 feliciaweb.dk
 frontloberne.dk
 frontloeberne.dk
@@ -24,6 +28,10 @@ olinesgaard.dk
 peronard.dk
 public-e.dk
 ressourceoptimering.dk
+skole.borneuni.dk
+support.borneuni.dk
+team.borneuni.dk
+tr.borneuni.dk
 vesterkaer.dk
 vhg26.dk
 xn--hbhbooking-c6ac.dk
diff --git a/bind/named.conf.pri b/bind/named.conf.pri
index 82e430f..6663453 100644
--- a/bind/named.conf.pri
+++ b/bind/named.conf.pri
@@ -11,6 +11,7 @@ zone "blanksoegaard.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/COR
 zone "bluepill.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/COREANDER-nomail";	allow-transfer { bb_slaves; }; }; // Spiff
 zone "borneuni.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/borneuni.dk";	allow-transfer { bb_slaves; }; }; // MacRonald
 zone "electrohype.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/COREANDER-nomail";	allow-transfer { bb_slaves; }; }; // Maria Minard
+zone "friis-holm.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/COREANDER";	allow-transfer { bb_slaves; }; }; // Mikkel Friis-Holm
 zone "himawari.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/COREANDER";	allow-transfer { bb_slaves; }; }; // Kristin Birkeland
 zone "idaa.dk"			{ type master;	file "/etc/local-BITBASE.DK/bind/pri/IDA";		allow-transfer { bb_slaves; }; }; // IDA
 zone "idraetsdaghojskolen.dk"	{ type master;	file "/etc/local-BITBASE.DK/bind/pri/IDA";		allow-transfer { bb_slaves; }; }; // IDA
@@ -27,7 +28,6 @@ zone "svalerne.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/svalerne
 zone "xn--blanksgaard-lgb.dk"	{ type master;	file "/etc/local-BITBASE.DK/bind/pri/COREANDER-nomail";	allow-transfer { bb_slaves; }; }; // Jones
 
 // int. ns.bitbase.dk
-zone "haakansson.com"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/haakansson.com";	allow-transfer { bb_slaves; }; }; // Christoffer Haakansson (reg=TotalReg)
 zone "taekkemand.net"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/COREANDER";		allow-transfer { bb_slaves; }; }; // Thomas Melbye
 
 // to-be-dropped ns.bitbase.dk
-- 
cgit v1.2.3