Add bitbase.dk to IMP/HORDE pools, and remove macvaerk.com

Change biks.dk hosts to point to coreander.jones.dk (not slamuf.jones.dk)
Update ChangeLog

3 files changed, 327 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 352554e..8c34333 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,301 @@
 
 -- 
 
+2002-09-25 08:35  Klaus Agnoletti <klaus@xenux.dk>
+
+	* bind/: fake/louiz.dk, pri/louiz.dk:
+
+		* Changed references to louiz.dk subdomains to A records rather that CNAMEs. Hopefully this will solve the mailproblems to louiz.dk subdomains.
+	
+2002-09-24 15:31  Klaus Agnoletti <klaus@xenux.dk>
+
+	* bind/pri/xenux.dk:
+
+		* Forgot to change serial - silly me :-P
+	
+2002-09-24 15:29  Klaus Agnoletti <klaus@xenux.dk>
+
+	* bind/pri/xenux.dk:
+
+		* Changed bilbo.xenux.dk to point to 195.184.114.14, since the old ip was taken.
+	
+2002-09-24 01:39  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/BITBASE/: BITBASE, BITBASE-EZ, bitbase.dk, icas.dk:
+
+	bind: Have BITBASE and BITBASE-EZ domains use themselves as mailhost.
+	
+2002-09-24 00:37  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/: named_SPIFF_pri.conf, BITBASE/BITBASE-EZ:
+
+	bind: Move adakrem.dk to new master config BITBASE-EZ (with bitbase.dk as mailhost).
+	
+2002-09-23 19:19  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/fake/107b.dk:
+
+	bind: Add fake svasiland.107b.dk.
+	
+2002-09-23 17:05  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/: named_ida.idaskolen.dk.conf,
+	named_ida.idraetsdaghojskolen.dk.conf, fake/IDA:
+
+	bind: Change ida.idraetsdaghojskolen.dk to ida.idaskolen.dk and add cups.idaskolen.dk to fake domain.
+	
+2002-09-23 16:58  Jonas Smedegaard <dr@jones.dk>
+
+	* file-ida.idaskolen.dk.m4:
+
+	m4: Correct samba printer queue for ida.idaskolen.dk.
+	
+2002-09-23 09:08  Klaus Agnoletti <klaus@xenux.dk>
+
+	* file-saks.louiz.dk.m4:
+
+		* Tilføjet HP Laserjet 2200dn til samba
+	
+2002-09-21 19:42  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/SPIFF/107b.dk:
+
+	bind: Add kfab.107b.dk and negon.107b.dk (and some more...).
+	
+2002-09-21 19:40  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/fake/107b.dk:
+
+	bind: Add kfab.107b.dk and negon.107b.dk.
+	
+2002-09-20 09:36  Klaus Agnoletti <klaus@xenux.dk>
+
+	* bind/fake/louiz.dk:
+
+		* Fixed a possible DNS problem for the internal DNS. CNAME for customer subdomains should point to mail and not to saks.
+	
+2002-09-20 09:34  Klaus Agnoletti <klaus@xenux.dk>
+
+	* bind/pri/louiz.dk:
+
+		* Corrected a possible DNS problem - CNAME for businesses should point to mail, not to saks.
+	
+2002-09-20 09:00  Klaus Agnoletti <klaus@xenux.dk>
+
+	* bind/fake/louiz.dk:
+
+		* Added Louiz' customer domains to internal DNS
+	
+2002-09-20 07:44  Klaus Agnoletti <klaus@xenux.dk>
+
+	* bind/pri/louiz.dk:
+
+		* Tilføjet phprojekt som et alias til saks - og et subdomain pr. virksomhed, der skal bruges til mailadresser.
+	
+2002-09-19 14:27  Jonas Smedegaard <dr@jones.dk>
+
+	* file-ida.idaskolen.dk.m4,
+	samba/netlogon/logon-ida.idaskolen.dk.bat:
+
+	Misc updates to ida.idaskolen.dk m4.
+	
+2002-09-19 14:12  Klaus Agnoletti <klaus@xenux.dk>
+
+	* logcheck/ignore.d.server/: gdm, tftpd:
+
+		* Modified gdm and added tftpd file to clean out syslog messages
+	
+2002-09-19 14:06  Klaus Agnoletti <klaus@xenux.dk>
+
+	* logcheck/ignore.d.server/dhcp3-common:
+
+		* Added 2 two rules in dhcp3-common to ignore some of the most annoying messages from syslog
+	
+2002-09-19 13:37  Klaus Agnoletti <klaus@xenux.dk>
+
+	* logcheck/ignore.d.server/courier:
+
+		* Added a rule to ignore disconnected imap-ssl users
+	
+2002-09-19 13:14  Jonas Smedegaard <dr@jones.dk>
+
+	* cfengine/cf.services.file:
+
+	cfengine: hide rem'ed lines in logon script, and just append (now that the whole file is purged).
+	
+2002-09-19 11:49  Jonas Smedegaard <dr@jones.dk>
+
+	* file-ida.idaskolen.dk.m4, cfengine/cf.groups.jones,
+	cfengine/cf.site, cfengine/cf.site.jones,
+	samba/netlogon/logon-ida.idaskolen.dk.bat:
+
+	Rename ida to idaskolen, and add samba scripts for ida.idaskolen.dk.
+	
+2002-09-19 11:48  Jonas Smedegaard <dr@jones.dk>
+
+	* cfengine/script.update_sambashares.sh:
+
+	cfengine: Have script.update_sambashares.sh fail on error.
+	
+2002-09-19 11:35  Jonas Smedegaard <dr@jones.dk>
+
+	* samba/smb-shares.conf.m4:
+
+	samba: Use /home/fsadmin/shares_win in example (as used in user-init.
+	
+2002-09-19 11:33  Jonas Smedegaard <dr@jones.dk>
+
+	* samba/smb-shares.conf.m4:
+
+	samba: simplify homefiles m4 logic, and note that _private_ is broken.
+	
+2002-09-19 07:40  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/BITBASE/bitbase.dk:
+
+	bind: Add coreander.bitbase.dk.
+	
+2002-09-17 21:53  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/: named_SPIFF_pri.conf, named_SPIFF_sec.conf:
+
+	bind: Add new domain fidse.org.
+	
+2002-09-17 13:57  Klaus Agnoletti <klaus@xenux.dk>
+
+	* bind/pri/xenux.dk:
+
+		* Added phprojektdemo.xenux.dk to DNS. Is going to used to demo phprojekt to potential customers.
+	
+2002-09-17 13:08  Klaus Agnoletti <klaus@xenux.dk>
+
+	* bind/pri/xenux.dk:
+
+		* Changed serial in zonefile to make dns update correctly.
+	
+2002-09-17 12:06  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/fake/107b.dk:
+
+	bind: tusch.107b.dk -> kenja.107b.dk (now that the machine seems to end af VEGA). Add egern.107b.dk and simbabve.107b.dk as well.
+	
+2002-09-16 11:18  Jonas Smedegaard <dr@jones.dk>
+
+	* sudoers:
+
+	sudoers: Allow only user-init for simple users (lowercase letters).
+	
+2002-09-16 10:40  Jonas Smedegaard <dr@jones.dk>
+
+	* cfengine/: cf.services.dhcp, cf.services.dns:
+
+	cfengine: Include files only if the included files exist.
+	
+2002-09-13 17:41  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/named_SPIFF_pri.conf:
+
+	bind: Correctly move jones.dk to SPIFF.
+	
+2002-09-12 17:47  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/BITBASE/bitbase.dk:
+
+	bind: Add hosts search, wiki and stats to bitbase.dk.
+	
+2002-09-12 17:13  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/: named_SPIFF_pri.conf, named_SPIFF_sec.conf,
+	named_XENUX_pri.conf, named_XENUX_sec.conf, SPIFF/louiz.dk,
+	pri/louiz.dk:
+
+	bind: Move louiz.dk from SPIFF to XENUX.
+	
+2002-09-12 16:57  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/: named_EZ.JONES_pri.conf, named_SPIFF_pri.conf,
+	BITBASE/BITBASE, BITBASE/bitbase.dk, BITBASE/icas.dk,
+	SPIFF/107b.dk, SPIFF/ASCII33, SPIFF/HOMEBASE, SPIFF/HOMEBASE-DINET,
+	SPIFF/HOMEBASE-SOPHISTIC, SPIFF/HOMEBASE-TUBA, SPIFF/IDA,
+	SPIFF/JONES, SPIFF/JONES-EZ, SPIFF/JONES-MAILONLY, SPIFF/LAB,
+	SPIFF/VEGA, SPIFF/advo-lyngby.dk, SPIFF/biks.dk,
+	SPIFF/diamond2002.dk, SPIFF/ez.jones.dk, SPIFF/haakansson.com,
+	SPIFF/homebase.dk, SPIFF/jones.dk, SPIFF/kaosacademy.dk,
+	SPIFF/kaosman.dk, SPIFF/louiz.dk, SPIFF/nyxforum.dk,
+	SPIFF/peronard.dk, SPIFF/relate.dk, SPIFF/riccos.dk,
+	SPIFF/shared.dk, SPIFF/steenwinkel.dk, SPIFF/vega.dk, pri/107b.dk,
+	pri/ASCII33, pri/BITBASE, pri/HOMEBASE, pri/HOMEBASE-DINET,
+	pri/HOMEBASE-SOPHISTIC, pri/HOMEBASE-TUBA, pri/IDA, pri/JONES,
+	pri/JONES-EZ, pri/JONES-MAILONLY, pri/LAB, pri/VEGA,
+	pri/advo-lyngby.dk, pri/biks.dk, pri/bitbase.dk,
+	pri/diamond2002.dk, pri/ez.jones.dk, pri/haakansson.com,
+	pri/homebase.dk, pri/icas.dk, pri/jones.dk, pri/kaosacademy.dk,
+	pri/kaosman.dk, pri/louiz.dk, pri/nyxforum.dk, pri/peronard.dk,
+	pri/relate.dk, pri/riccos.dk, pri/shared.dk, pri/steenwinkel.dk,
+	pri/vega.dk:
+
+	bind: Separate SPIFF and BITBASE domains from the rest.
+	
+2002-09-12 13:56  Klaus Agnoletti <klaus@xenux.dk>
+
+	* bind/fake/: 192.168.101-louiz.dk, louiz.dk:
+
+	added phprojekt as a host on louiz.dk
+	
+2002-09-12 08:24  Jonas Smedegaard <dr@jones.dk>
+
+	* file-debian.cafe3.local.m4, samba/smb-shares.conf.m4:
+
+	samba: Add m4 files for debian.cafe3.local.
+	
+2002-09-11 22:18  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/: fake/vega.dk, pri/vega.dk:
+
+	bind: Add hostname stats.vega.dk.
+	
+2002-09-11 08:06  Klaus Agnoletti <klaus@xenux.dk>
+
+	* logcheck/ignore.d.server/postfix:
+
+	Added rule to postfix to make it ignore Bad EHLO relies from other mailservers.
+	
+2002-09-11 07:53  Klaus Agnoletti <klaus@xenux.dk>
+
+	* logcheck/ignore.d.server/courier:
+
+	Added rules to courier part of logcheck to make it ignore 'courierpop3login: TIMEOUT' messages in syslog.
+	
+2002-09-10 14:35  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/fake/107b.dk:
+
+	bind: Add hosts emil-louise and HAleDual to fake 107b.dk domain.
+	
+2002-09-10 08:53  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/: named_SPIFF_pri.conf, named_SPIFF_sec.conf:
+
+	bind: Add domain adakrem.dk to JONES-EZ.
+	
+2002-09-09 21:27  Jonas Smedegaard <dr@jones.dk>
+
+	* bind/pri/icas.dk:
+
+	bind: Add host respons.icas.dk.
+	
+2002-09-09 20:23  Jonas Smedegaard <dr@jones.dk>
+
+	* sudoers:
+
+	sudoers: Allow webusers to run user-init (needed for webphpsites).
+	
+2002-09-09 17:06  Jonas Smedegaard <dr@jones.dk>
+
+	* ChangeLog:
+
+	Update changelog.
+	
 2002-09-06 11:33  Klaus Agnoletti <klaus@xenux.dk>
 
 	* logcheck/ignore.d.server/: courier, postfix:
diff --git a/imp/servers.php3 b/imp/servers.php3
index 87cc155..69e992a 100644
--- a/imp/servers.php3
+++ b/imp/servers.php3
@@ -67,21 +67,6 @@ $IMAPServers['homebase'] = new IMAPServer('Homebase',
 						"homebase.horde.biks.dk"
 						));
 
-$IMAPServers['macvaerk'] = new IMAPServer('Macvaerk',
-					'mail.macvaerk.com',
-					143,
-					'',
-					'macvaerk.com',
-					array(
-						"macvaerk.com",
-						"mail.macvaerk.com",
-						"www.macvaerk.com",
-						"woody.macvaerk.com",
-						"macvaerk.dk",
-						"www.macvaerk.dk",
-						"macvaerk.horde.biks.dk"
-						));
-
 $IMAPServers['a-host'] = new IMAPServer('a-host',
 					'mail2.a-host.dk',
 					143,
@@ -112,5 +97,19 @@ $IMAPServers['louiz'] = new IMAPServer('Louiz',
 						"louiz.horde.biks.dk"
 						));
 
+$IMAPServers['bitbase'] = new IMAPServer('Bitbase',
+					'mail.bitbase.dk',
+					143,
+					'',
+					'bitbase.dk',
+					array(
+						"bitbase.imp.jones.dk"
+						"bitbase.imp.homebase.dk"
+						"bitbase.imp.107b.dk"
+						"bitbase.imp.a-host.dk"
+						"bitbase.imp.vega.dk"
+						"bitbase.imp.bitbase.dk"
+						));
+
 
 ?>
diff --git a/imp3/servers.php b/imp3/servers.php
index c8cc2d0..401dd25 100644
--- a/imp3/servers.php
+++ b/imp3/servers.php
@@ -92,4 +92,22 @@ $servers['vega'] = array(
 					"vega.horde.vega.dk",
 				)
 );
+$servers['bitbase'] = array(
+	'name'		=>	'Bitbase',
+	'server'	=>	'mail.bitbase.dk',
+	'port'		=>	143,
+	'protocol'	=>	'imap',
+	'folders'	=>	'',
+	'namespace'	=>	'',
+	'maildomain'	=>	'bitbase.dk',
+	'smtphost'	=>	'localhost',
+	'realm'		=>	'bitbase.dk',
+	'preferred'	=>	array(
+					"bitbase.horde.jones.dk",
+					"bitbase.horde.homebase.dk",
+					"bitbase.horde.biks.dk",
+					"bitbase.horde.louiz.dk",
+					"bitbase.horde.vega.dk",
+				)
+);
 ?>