summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-02-17 14:37:54 +0100
committerJonas Smedegaard <dr@jones.dk>2011-02-17 14:37:54 +0100
commitd22d7b5c1508d4f3ced088a05722ea07231a8add (patch)
tree9b9dc4ecb4a6a3c1f2e772ceaaa058157412acec
parentec99bc8051f85cdfbf294447ffd7c1027926fca2 (diff)
parent064b47009cd4278469c245f4dd70e1ce572a6f5d (diff)
Merge branch 'master' of coreander:/srv/git/source.jones.dk/local-REDPILL.DK
-rw-r--r--BITBASE.DK/maildomains1
-rw-r--r--BITBASE.DK/mailnetworks2
-rw-r--r--BITBASE.DK/mailrecipients464
-rw-r--r--BORNEUNI.DK/mailnetworks2
-rw-r--r--DELEBILFONDEN.DK/mailnetworks0
-rw-r--r--DGI-HUSET.DK/mailnetworks2
-rw-r--r--HOMEBASE.DK/mailnetworks2
-rw-r--r--JONES.DK/mailnetworks2
-rw-r--r--KOMPONENT.DK/mailnetworks2
-rwxr-xr-xpostfix/mkpostfixconfig.sh10
-rw-r--r--postfix/permit_mx_backup_networks12
11 files changed, 470 insertions, 29 deletions
diff --git a/BITBASE.DK/maildomains b/BITBASE.DK/maildomains
index f4dcbcb..b314285 100644
--- a/BITBASE.DK/maildomains
+++ b/BITBASE.DK/maildomains
@@ -1,6 +1,7 @@
bitbase.dk
friis-holm.dk
himawari.dk
+list.artofhosting.org
lists.jones.dk
redpill.dk
superserver.dk
diff --git a/BITBASE.DK/mailnetworks b/BITBASE.DK/mailnetworks
index f511673..3494a84 100644
--- a/BITBASE.DK/mailnetworks
+++ b/BITBASE.DK/mailnetworks
@@ -7,8 +7,6 @@
# mx_backup_networks = /etc/local-COMMON/postfix/mx_networks
# smtpd_recipient_restrictions = permit_mynetworks, permit_mx_backup, reject_non_fqdn_recipient, reject_unauth_destination
#
-# $Id: mailnetworks,v 1.3 2007-12-05 07:52:43 jonas Exp $
-#
#coreander.vm.bytemark.co.uk (100Mbit jump.net.uk)
80.68.88.141/32
diff --git a/BITBASE.DK/mailrecipients b/BITBASE.DK/mailrecipients
index febb700..4d6d9b0 100644
--- a/BITBASE.DK/mailrecipients
+++ b/BITBASE.DK/mailrecipients
@@ -5,8 +5,18 @@ alvilda-web@bitbase.dk OK
amavis@bitbase.dk OK
anderskr@bitbase.dk OK
annak@bitbase.dk OK
-asbjorn@bitbase.dk OK
+aoh-admin@bitbase.dk OK
+aoh-bounces@bitbase.dk OK
+aoh-confirm@bitbase.dk OK
+aoh-join@bitbase.dk OK
+aoh-leave@bitbase.dk OK
+aoh-owner@bitbase.dk OK
+aoh-request@bitbase.dk OK
+aoh-subscribe@bitbase.dk OK
+aoh-unsubscribe@bitbase.dk OK
+aoh@bitbase.dk OK
asbjorn-web@bitbase.dk OK
+asbjorn@bitbase.dk OK
asterisk@bitbase.dk OK
backup@bitbase.dk OK
bin@bitbase.dk OK
@@ -18,6 +28,7 @@ bu@bitbase.dk OK
bynu@bitbase.dk OK
clamav@bitbase.dk OK
clb@bitbase.dk OK
+cyberhus@bitbase.dk OK
cygne@bitbase.dk OK
daemon@bitbase.dk OK
debian@bitbase.dk OK
@@ -26,7 +37,6 @@ dovecot@bitbase.dk OK
dspam@bitbase.dk OK
ejabberd@bitbase.dk OK
fm@bitbase.dk OK
-freerad@bitbase.dk OK
friis@bitbase.dk OK
ftp@bitbase.dk OK
games@bitbase.dk OK
@@ -42,12 +52,15 @@ ida@bitbase.dk OK
iodine@bitbase.dk OK
irc@bitbase.dk OK
jonas@bitbase.dk OK
+kannel@bitbase.dk OK
kpno@bitbase.dk OK
kristin@bitbase.dk OK
+kurt@bitbase.dk OK
libuuid@bitbase.dk OK
linuxpilot@bitbase.dk OK
list@bitbase.dk OK
listdomains@bitbase.dk OK
+listmaster@bitbase.dk OK
ll@bitbase.dk OK
loga@bitbase.dk OK
logcheck@bitbase.dk OK
@@ -59,6 +72,7 @@ mailman-loop@bitbase.dk OK
man@bitbase.dk OK
mani@bitbase.dk OK
martin@bitbase.dk OK
+messagebus@bitbase.dk OK
mettehass@bitbase.dk OK
mikkelfh@bitbase.dk OK
mmeyer@bitbase.dk OK
@@ -67,11 +81,11 @@ mysql@bitbase.dk OK
news@bitbase.dk OK
nobody@bitbase.dk OK
noc@bitbase.dk OK
-ntpd@bitbase.dk OK
+ntp@bitbase.dk OK
perkrull@bitbase.dk OK
pootle-admin@bitbase.dk OK
-pootle@bitbase.dk OK
pootle-registration@bitbase.dk OK
+pootle@bitbase.dk OK
postfix@bitbase.dk OK
postgres@bitbase.dk OK
postgrey@bitbase.dk OK
@@ -85,12 +99,23 @@ sg@bitbase.dk OK
si@bitbase.dk OK
siri@bitbase.dk OK
sirireiter@bitbase.dk OK
+sobby@bitbase.dk OK
soren@bitbase.dk OK
sshd@bitbase.dk OK
svale@bitbase.dk OK
sympa@bitbase.dk OK
sync@bitbase.dk OK
sys@bitbase.dk OK
+test-admin@bitbase.dk OK
+test-bounces@bitbase.dk OK
+test-confirm@bitbase.dk OK
+test-join@bitbase.dk OK
+test-leave@bitbase.dk OK
+test-owner@bitbase.dk OK
+test-request@bitbase.dk OK
+test-subscribe@bitbase.dk OK
+test-unsubscribe@bitbase.dk OK
+test@bitbase.dk OK
ull@bitbase.dk OK
usenet@bitbase.dk OK
uucp@bitbase.dk OK
@@ -98,10 +123,141 @@ web-hass@bitbase.dk OK
web-jones@bitbase.dk OK
webmaster@bitbase.dk OK
wka@bitbase.dk OK
-www@bitbase.dk OK
www-data@bitbase.dk OK
+www@bitbase.dk OK
+yacy@bitbase.dk OK
zope@bitbase.dk OK
zulma@bitbase.dk OK
+abuse@coreander.jones.dk OK
+ada@coreander.jones.dk OK
+adakrem@coreander.jones.dk OK
+alvilda-web@coreander.jones.dk OK
+amavis@coreander.jones.dk OK
+anderskr@coreander.jones.dk OK
+annak@coreander.jones.dk OK
+aoh-admin@coreander.jones.dk OK
+aoh-bounces@coreander.jones.dk OK
+aoh-confirm@coreander.jones.dk OK
+aoh-join@coreander.jones.dk OK
+aoh-leave@coreander.jones.dk OK
+aoh-owner@coreander.jones.dk OK
+aoh-request@coreander.jones.dk OK
+aoh-subscribe@coreander.jones.dk OK
+aoh-unsubscribe@coreander.jones.dk OK
+aoh@coreander.jones.dk OK
+asbjorn-web@coreander.jones.dk OK
+asbjorn@coreander.jones.dk OK
+asterisk@coreander.jones.dk OK
+backup@coreander.jones.dk OK
+bin@coreander.jones.dk OK
+bind@coreander.jones.dk OK
+bitlbee@coreander.jones.dk OK
+borneuni@coreander.jones.dk OK
+bsg@coreander.jones.dk OK
+bu@coreander.jones.dk OK
+bynu@coreander.jones.dk OK
+clamav@coreander.jones.dk OK
+clb@coreander.jones.dk OK
+cyberhus@coreander.jones.dk OK
+cygne@coreander.jones.dk OK
+daemon@coreander.jones.dk OK
+debian@coreander.jones.dk OK
+dkimproxy@coreander.jones.dk OK
+dovecot@coreander.jones.dk OK
+dspam@coreander.jones.dk OK
+ejabberd@coreander.jones.dk OK
+fm@coreander.jones.dk OK
+friis@coreander.jones.dk OK
+ftp@coreander.jones.dk OK
+games@coreander.jones.dk OK
+gebran@coreander.jones.dk OK
+gnats@coreander.jones.dk OK
+gsv@coreander.jones.dk OK
+hass@coreander.jones.dk OK
+hearth@coreander.jones.dk OK
+himawari@coreander.jones.dk OK
+hostmaster@coreander.jones.dk OK
+hysbald@coreander.jones.dk OK
+ida@coreander.jones.dk OK
+iodine@coreander.jones.dk OK
+irc@coreander.jones.dk OK
+jonas@coreander.jones.dk OK
+kannel@coreander.jones.dk OK
+kpno@coreander.jones.dk OK
+kristin@coreander.jones.dk OK
+kurt@coreander.jones.dk OK
+libuuid@coreander.jones.dk OK
+linuxpilot@coreander.jones.dk OK
+list@coreander.jones.dk OK
+listdomains@coreander.jones.dk OK
+listmaster@coreander.jones.dk OK
+ll@coreander.jones.dk OK
+loga@coreander.jones.dk OK
+logcheck@coreander.jones.dk OK
+lotte@coreander.jones.dk OK
+lp@coreander.jones.dk OK
+mail@coreander.jones.dk OK
+mailer-daemon@coreander.jones.dk OK
+mailman-loop@coreander.jones.dk OK
+man@coreander.jones.dk OK
+mani@coreander.jones.dk OK
+martin@coreander.jones.dk OK
+messagebus@coreander.jones.dk OK
+mettehass@coreander.jones.dk OK
+mikkelfh@coreander.jones.dk OK
+mmeyer@coreander.jones.dk OK
+mn@coreander.jones.dk OK
+mysql@coreander.jones.dk OK
+news@coreander.jones.dk OK
+nobody@coreander.jones.dk OK
+noc@coreander.jones.dk OK
+ntp@coreander.jones.dk OK
+perkrull@coreander.jones.dk OK
+pootle-admin@coreander.jones.dk OK
+pootle-registration@coreander.jones.dk OK
+pootle@coreander.jones.dk OK
+postfix@coreander.jones.dk OK
+postgres@coreander.jones.dk OK
+postgrey@coreander.jones.dk OK
+postmaster@coreander.jones.dk OK
+proxy@coreander.jones.dk OK
+redpill@coreander.jones.dk OK
+risan-web@coreander.jones.dk OK
+root@coreander.jones.dk OK
+security@coreander.jones.dk OK
+sg@coreander.jones.dk OK
+si@coreander.jones.dk OK
+siri@coreander.jones.dk OK
+sirireiter@coreander.jones.dk OK
+sobby@coreander.jones.dk OK
+soren@coreander.jones.dk OK
+sshd@coreander.jones.dk OK
+svale@coreander.jones.dk OK
+sympa@coreander.jones.dk OK
+sync@coreander.jones.dk OK
+sys@coreander.jones.dk OK
+test-admin@coreander.jones.dk OK
+test-bounces@coreander.jones.dk OK
+test-confirm@coreander.jones.dk OK
+test-join@coreander.jones.dk OK
+test-leave@coreander.jones.dk OK
+test-owner@coreander.jones.dk OK
+test-request@coreander.jones.dk OK
+test-subscribe@coreander.jones.dk OK
+test-unsubscribe@coreander.jones.dk OK
+test@coreander.jones.dk OK
+ull@coreander.jones.dk OK
+usenet@coreander.jones.dk OK
+uucp@coreander.jones.dk OK
+web-hass@coreander.jones.dk OK
+web-jones@coreander.jones.dk OK
+webmaster@coreander.jones.dk OK
+wka@coreander.jones.dk OK
+www-data@coreander.jones.dk OK
+www@coreander.jones.dk OK
+yacy@coreander.jones.dk OK
+zope@coreander.jones.dk OK
+zulma@coreander.jones.dk OK
abuse@friis-holm.dk OK
anna@friis-holm.dk OK
hostmaster@friis-holm.dk OK
@@ -116,10 +272,308 @@ kristin@himawari.dk OK
postmaster@himawari.dk OK
webmaster@himawari.dk OK
zulma@himawari.dk OK
+abuse@list.artofhosting.org OK
+aoh-admin@list.artofhosting.org OK
+aoh-bounces@list.artofhosting.org OK
+aoh-confirm@list.artofhosting.org OK
+aoh-join@list.artofhosting.org OK
+aoh-leave@list.artofhosting.org OK
+aoh-owner@list.artofhosting.org OK
+aoh-request@list.artofhosting.org OK
+aoh-subscribe@list.artofhosting.org OK
+aoh-unsubscribe@list.artofhosting.org OK
+aoh@list.artofhosting.org OK
+hostmaster@list.artofhosting.org OK
+mailman-loop@list.artofhosting.org OK
+postmaster@list.artofhosting.org OK
abuse@lists.jones.dk OK
+aoh-admin@lists.jones.dk OK
+aoh-bounces@lists.jones.dk OK
+aoh-confirm@lists.jones.dk OK
+aoh-join@lists.jones.dk OK
+aoh-leave@lists.jones.dk OK
+aoh-owner@lists.jones.dk OK
+aoh-request@lists.jones.dk OK
+aoh-subscribe@lists.jones.dk OK
+aoh-unsubscribe@lists.jones.dk OK
+aoh@lists.jones.dk OK
hostmaster@lists.jones.dk OK
mailman-loop@lists.jones.dk OK
postmaster@lists.jones.dk OK
+abuse@localhost OK
+ada@localhost OK
+adakrem@localhost OK
+alvilda-web@localhost OK
+amavis@localhost OK
+anderskr@localhost OK
+annak@localhost OK
+aoh-admin@localhost OK
+aoh-bounces@localhost OK
+aoh-confirm@localhost OK
+aoh-join@localhost OK
+aoh-leave@localhost OK
+aoh-owner@localhost OK
+aoh-request@localhost OK
+aoh-subscribe@localhost OK
+aoh-unsubscribe@localhost OK
+aoh@localhost OK
+asbjorn-web@localhost OK
+asbjorn@localhost OK
+asterisk@localhost OK
+backup@localhost OK
+bin@localhost OK
+bind@localhost OK
+bitlbee@localhost OK
+borneuni@localhost OK
+bsg@localhost OK
+bu@localhost OK
+bynu@localhost OK
+clamav@localhost OK
+clb@localhost OK
+cyberhus@localhost OK
+cygne@localhost OK
+daemon@localhost OK
+debian@localhost OK
+dkimproxy@localhost OK
+dovecot@localhost OK
+dspam@localhost OK
+ejabberd@localhost OK
+fm@localhost OK
+friis@localhost OK
+ftp@localhost OK
+games@localhost OK
+gebran@localhost OK
+gnats@localhost OK
+gsv@localhost OK
+hass@localhost OK
+hearth@localhost OK
+himawari@localhost OK
+hostmaster@localhost OK
+hysbald@localhost OK
+ida@localhost OK
+iodine@localhost OK
+irc@localhost OK
+jonas@localhost OK
+kannel@localhost OK
+kpno@localhost OK
+kristin@localhost OK
+kurt@localhost OK
+libuuid@localhost OK
+linuxpilot@localhost OK
+list@localhost OK
+listdomains@localhost OK
+listmaster@localhost OK
+ll@localhost OK
+loga@localhost OK
+logcheck@localhost OK
+lotte@localhost OK
+lp@localhost OK
+mail@localhost OK
+mailer-daemon@localhost OK
+mailman-loop@localhost OK
+man@localhost OK
+mani@localhost OK
+martin@localhost OK
+messagebus@localhost OK
+mettehass@localhost OK
+mikkelfh@localhost OK
+mmeyer@localhost OK
+mn@localhost OK
+mysql@localhost OK
+news@localhost OK
+nobody@localhost OK
+noc@localhost OK
+ntp@localhost OK
+perkrull@localhost OK
+pootle-admin@localhost OK
+pootle-registration@localhost OK
+pootle@localhost OK
+postfix@localhost OK
+postgres@localhost OK
+postgrey@localhost OK
+postmaster@localhost OK
+proxy@localhost OK
+redpill@localhost OK
+risan-web@localhost OK
+root@localhost OK
+security@localhost OK
+sg@localhost OK
+si@localhost OK
+siri@localhost OK
+sirireiter@localhost OK
+sobby@localhost OK
+soren@localhost OK
+sshd@localhost OK
+svale@localhost OK
+sympa@localhost OK
+sync@localhost OK
+sys@localhost OK
+test-admin@localhost OK
+test-bounces@localhost OK
+test-confirm@localhost OK
+test-join@localhost OK
+test-leave@localhost OK
+test-owner@localhost OK
+test-request@localhost OK
+test-subscribe@localhost OK
+test-unsubscribe@localhost OK
+test@localhost OK
+ull@localhost OK
+usenet@localhost OK
+uucp@localhost OK
+web-hass@localhost OK
+web-jones@localhost OK
+webmaster@localhost OK
+wka@localhost OK
+www-data@localhost OK
+www@localhost OK
+yacy@localhost OK
+zope@localhost OK
+zulma@localhost OK
+abuse@mail.bitbase.dk OK
+ada@mail.bitbase.dk OK
+adakrem@mail.bitbase.dk OK
+alvilda-web@mail.bitbase.dk OK
+amavis@mail.bitbase.dk OK
+anderskr@mail.bitbase.dk OK
+annak@mail.bitbase.dk OK
+aoh-admin@mail.bitbase.dk OK
+aoh-bounces@mail.bitbase.dk OK
+aoh-confirm@mail.bitbase.dk OK
+aoh-join@mail.bitbase.dk OK
+aoh-leave@mail.bitbase.dk OK
+aoh-owner@mail.bitbase.dk OK
+aoh-request@mail.bitbase.dk OK
+aoh-subscribe@mail.bitbase.dk OK
+aoh-unsubscribe@mail.bitbase.dk OK
+aoh@mail.bitbase.dk OK
+asbjorn-web@mail.bitbase.dk OK
+asbjorn@mail.bitbase.dk OK
+asterisk@mail.bitbase.dk OK
+backup@mail.bitbase.dk OK
+bin@mail.bitbase.dk OK
+bind@mail.bitbase.dk OK
+bitlbee@mail.bitbase.dk OK
+borneuni@mail.bitbase.dk OK
+bsg@mail.bitbase.dk OK
+bu@mail.bitbase.dk OK
+bynu@mail.bitbase.dk OK
+clamav@mail.bitbase.dk OK
+clb@mail.bitbase.dk OK
+cyberhus@mail.bitbase.dk OK
+cygne@mail.bitbase.dk OK
+daemon@mail.bitbase.dk OK
+debian@mail.bitbase.dk OK
+dkimproxy@mail.bitbase.dk OK
+dovecot@mail.bitbase.dk OK
+dspam@mail.bitbase.dk OK
+ejabberd@mail.bitbase.dk OK
+fm@mail.bitbase.dk OK
+friis@mail.bitbase.dk OK
+ftp@mail.bitbase.dk OK
+games@mail.bitbase.dk OK
+gebran@mail.bitbase.dk OK
+gnats@mail.bitbase.dk OK
+gsv@mail.bitbase.dk OK
+hass@mail.bitbase.dk OK
+hearth@mail.bitbase.dk OK
+himawari@mail.bitbase.dk OK
+hostmaster@mail.bitbase.dk OK
+hysbald@mail.bitbase.dk OK
+ida@mail.bitbase.dk OK
+iodine@mail.bitbase.dk OK
+irc@mail.bitbase.dk OK
+jonas@mail.bitbase.dk OK
+kannel@mail.bitbase.dk OK
+kpno@mail.bitbase.dk OK
+kristin@mail.bitbase.dk OK
+kurt@mail.bitbase.dk OK
+libuuid@mail.bitbase.dk OK
+linuxpilot@mail.bitbase.dk OK
+list@mail.bitbase.dk OK
+listdomains@mail.bitbase.dk OK
+listmaster@mail.bitbase.dk OK
+ll@mail.bitbase.dk OK
+loga@mail.bitbase.dk OK
+logcheck@mail.bitbase.dk OK
+lotte@mail.bitbase.dk OK
+lp@mail.bitbase.dk OK
+mail@mail.bitbase.dk OK
+mailer-daemon@mail.bitbase.dk OK
+mailman-loop@mail.bitbase.dk OK
+man@mail.bitbase.dk OK
+mani@mail.bitbase.dk OK
+martin@mail.bitbase.dk OK
+messagebus@mail.bitbase.dk OK
+mettehass@mail.bitbase.dk OK
+mikkelfh@mail.bitbase.dk OK
+mmeyer@mail.bitbase.dk OK
+mn@mail.bitbase.dk OK
+mysql@mail.bitbase.dk OK
+news@mail.bitbase.dk OK
+nobody@mail.bitbase.dk OK
+noc@mail.bitbase.dk OK
+ntp@mail.bitbase.dk OK
+perkrull@mail.bitbase.dk OK
+pootle-admin@mail.bitbase.dk OK
+pootle-registration@mail.bitbase.dk OK
+pootle@mail.bitbase.dk OK
+postfix@mail.bitbase.dk OK
+postgres@mail.bitbase.dk OK
+postgrey@mail.bitbase.dk OK
+postmaster@mail.bitbase.dk OK
+proxy@mail.bitbase.dk OK
+redpill@mail.bitbase.dk OK
+risan-web@mail.bitbase.dk OK
+root@mail.bitbase.dk OK
+security@mail.bitbase.dk OK
+sg@mail.bitbase.dk OK
+si@mail.bitbase.dk OK
+siri@mail.bitbase.dk OK
+sirireiter@mail.bitbase.dk OK
+sobby@mail.bitbase.dk OK
+soren@mail.bitbase.dk OK
+sshd@mail.bitbase.dk OK
+svale@mail.bitbase.dk OK
+sympa@mail.bitbase.dk OK
+sync@mail.bitbase.dk OK
+sys@mail.bitbase.dk OK
+test-admin@mail.bitbase.dk OK
+test-bounces@mail.bitbase.dk OK
+test-confirm@mail.bitbase.dk OK
+test-join@mail.bitbase.dk OK
+test-leave@mail.bitbase.dk OK
+test-owner@mail.bitbase.dk OK
+test-request@mail.bitbase.dk OK
+test-subscribe@mail.bitbase.dk OK
+test-unsubscribe@mail.bitbase.dk OK
+test@mail.bitbase.dk OK
+ull@mail.bitbase.dk OK
+usenet@mail.bitbase.dk OK
+uucp@mail.bitbase.dk OK
+web-hass@mail.bitbase.dk OK
+web-jones@mail.bitbase.dk OK
+webmaster@mail.bitbase.dk OK
+wka@mail.bitbase.dk OK
+www-data@mail.bitbase.dk OK
+www@mail.bitbase.dk OK
+yacy@mail.bitbase.dk OK
+zope@mail.bitbase.dk OK
+zulma@mail.bitbase.dk OK
abuse@mettehass.dk OK
hostmaster@mettehass.dk OK
postmaster@mettehass.dk OK
+abuse@testlist.artofhosting.org OK
+hostmaster@testlist.artofhosting.org OK
+mailman-loop@testlist.artofhosting.org OK
+postmaster@testlist.artofhosting.org OK
+test-admin@testlist.artofhosting.org OK
+test-bounces@testlist.artofhosting.org OK
+test-confirm@testlist.artofhosting.org OK
+test-join@testlist.artofhosting.org OK
+test-leave@testlist.artofhosting.org OK
+test-owner@testlist.artofhosting.org OK
+test-request@testlist.artofhosting.org OK
+test-subscribe@testlist.artofhosting.org OK
+test-unsubscribe@testlist.artofhosting.org OK
+test@testlist.artofhosting.org OK
diff --git a/BORNEUNI.DK/mailnetworks b/BORNEUNI.DK/mailnetworks
index 76e347a..f6924d7 100644
--- a/BORNEUNI.DK/mailnetworks
+++ b/BORNEUNI.DK/mailnetworks
@@ -7,8 +7,6 @@
# mx_backup_networks = /etc/local-COMMON/postfix/mx_networks
# smtpd_recipient_restrictions = permit_mynetworks, permit_mx_backup, reject_non_fqdn_recipient, reject_unauth_destination
#
-# $Id: mailnetworks,v 1.1 2008-09-22 12:52:05 jonas Exp $
-#
#borneuni.dk (Slicehost, cogentco.com)
209.20.88.45/32
diff --git a/DELEBILFONDEN.DK/mailnetworks b/DELEBILFONDEN.DK/mailnetworks
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/DELEBILFONDEN.DK/mailnetworks
diff --git a/DGI-HUSET.DK/mailnetworks b/DGI-HUSET.DK/mailnetworks
index 0264f0d..4d99338 100644
--- a/DGI-HUSET.DK/mailnetworks
+++ b/DGI-HUSET.DK/mailnetworks
@@ -7,8 +7,6 @@
# mx_backup_networks = /etc/local-COMMON/postfix/mx_networks
# smtpd_recipient_restrictions = permit_mynetworks, permit_mx_backup, reject_non_fqdn_recipient, reject_unauth_destination
#
-# $Id: mailnetworks,v 1.1 2006-10-23 22:00:23 jonas Exp $
-#
#dgi-huset.dk (ADSL TeleDK)
80.166.109.186/32
diff --git a/HOMEBASE.DK/mailnetworks b/HOMEBASE.DK/mailnetworks
index aa5fd9c..59e2a96 100644
--- a/HOMEBASE.DK/mailnetworks
+++ b/HOMEBASE.DK/mailnetworks
@@ -7,8 +7,6 @@
# mx_backup_networks = /etc/local-COMMON/postfix/mx_networks
# smtpd_recipient_restrictions = permit_mynetworks, permit_mx_backup, reject_non_fqdn_recipient, reject_unauth_destination
#
-# $Id: mailnetworks,v 1.3 2007-07-14 11:54:10 jonas Exp $
-#
#homebase.dk (WLAN Sonofon)
62.121.169.66/32
diff --git a/JONES.DK/mailnetworks b/JONES.DK/mailnetworks
index 4e2ffaa..2c442bd 100644
--- a/JONES.DK/mailnetworks
+++ b/JONES.DK/mailnetworks
@@ -7,8 +7,6 @@
# mx_backup_networks = /etc/local-COMMON/postfix/mx_networks
# smtpd_recipient_restrictions = permit_mynetworks, permit_mx_backup, reject_non_fqdn_recipient, reject_unauth_destination
#
-# $Id: mailnetworks,v 1.9 2008-06-12 13:54:41 jonas Exp $
-#
#jones.dk (ADSL Perspektivbredband)
87.59.52.115/32
diff --git a/KOMPONENT.DK/mailnetworks b/KOMPONENT.DK/mailnetworks
index 7a6f663..da2757b 100644
--- a/KOMPONENT.DK/mailnetworks
+++ b/KOMPONENT.DK/mailnetworks
@@ -7,8 +7,6 @@
# mx_backup_networks = /etc/local-COMMON/postfix/mx_networks
# smtpd_recipient_restrictions = permit_mynetworks, permit_mx_backup, reject_non_fqdn_recipient, reject_unauth_destination
#
-# $Id: mailnetworks,v 1.4 2010-02-28 10:51:15 jonas Exp $
-#
#107b.dk (nianet)
193.106.165.64/32
diff --git a/postfix/mkpostfixconfig.sh b/postfix/mkpostfixconfig.sh
index 682f89b..d5a91ed 100755
--- a/postfix/mkpostfixconfig.sh
+++ b/postfix/mkpostfixconfig.sh
@@ -6,6 +6,16 @@ basedir="/etc/local-REDPILL"
domains="$(cat "$basedir/realms" | sed 's/#.*//')"
+exit1() {
+ response="${1:+Error: }${1:-Internal error!}"
+ echo "$response"
+ exit 1
+}
+
+for domain in $domains; do
+ [ -r "$basedir/$domain/mailnetworks" ] || exit1 "Could not read input file $basedir/$domain/mailnetworks"
+done
+
echo '' > "$basedir/postfix/permit_mx_backup_networks"
for domain in $domains; do
cat "$basedir/$domain/mailnetworks" >> "$basedir/postfix/permit_mx_backup_networks"
diff --git a/postfix/permit_mx_backup_networks b/postfix/permit_mx_backup_networks
index 8c38a81..802a9fc 100644
--- a/postfix/permit_mx_backup_networks
+++ b/postfix/permit_mx_backup_networks
@@ -8,8 +8,6 @@
# mx_backup_networks = /etc/local-COMMON/postfix/mx_networks
# smtpd_recipient_restrictions = permit_mynetworks, permit_mx_backup, reject_non_fqdn_recipient, reject_unauth_destination
#
-# $Id: permit_mx_backup_networks,v 1.16 2010-02-28 10:51:15 jonas Exp $
-#
#coreander.vm.bytemark.co.uk (100Mbit jump.net.uk)
80.68.88.141/32
@@ -22,8 +20,6 @@
# mx_backup_networks = /etc/local-COMMON/postfix/mx_networks
# smtpd_recipient_restrictions = permit_mynetworks, permit_mx_backup, reject_non_fqdn_recipient, reject_unauth_destination
#
-# $Id: permit_mx_backup_networks,v 1.16 2010-02-28 10:51:15 jonas Exp $
-#
#borneuni.dk (Slicehost, cogentco.com)
209.20.88.45/32
@@ -36,8 +32,6 @@
# mx_backup_networks = /etc/local-COMMON/postfix/mx_networks
# smtpd_recipient_restrictions = permit_mynetworks, permit_mx_backup, reject_non_fqdn_recipient, reject_unauth_destination
#
-# $Id: permit_mx_backup_networks,v 1.16 2010-02-28 10:51:15 jonas Exp $
-#
#dgi-huset.dk (ADSL TeleDK)
80.166.109.186/32
@@ -50,8 +44,6 @@
# mx_backup_networks = /etc/local-COMMON/postfix/mx_networks
# smtpd_recipient_restrictions = permit_mynetworks, permit_mx_backup, reject_non_fqdn_recipient, reject_unauth_destination
#
-# $Id: permit_mx_backup_networks,v 1.16 2010-02-28 10:51:15 jonas Exp $
-#
#homebase.dk (WLAN Sonofon)
62.121.169.66/32
@@ -67,8 +59,6 @@
# mx_backup_networks = /etc/local-COMMON/postfix/mx_networks
# smtpd_recipient_restrictions = permit_mynetworks, permit_mx_backup, reject_non_fqdn_recipient, reject_unauth_destination
#
-# $Id: permit_mx_backup_networks,v 1.16 2010-02-28 10:51:15 jonas Exp $
-#
#jones.dk (ADSL Perspektivbredband)
87.59.52.115/32
@@ -81,8 +71,6 @@
# mx_backup_networks = /etc/local-COMMON/postfix/mx_networks
# smtpd_recipient_restrictions = permit_mynetworks, permit_mx_backup, reject_non_fqdn_recipient, reject_unauth_destination
#
-# $Id: permit_mx_backup_networks,v 1.16 2010-02-28 10:51:15 jonas Exp $
-#
#107b.dk (nianet)
193.106.165.64/32