diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2011-02-17 14:37:54 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2011-02-17 14:37:54 +0100 |
| commit | d22d7b5c1508d4f3ced088a05722ea07231a8add (patch) | |
| tree | 9b9dc4ecb4a6a3c1f2e772ceaaa058157412acec /postfix | |
| parent | ec99bc8051f85cdfbf294447ffd7c1027926fca2 (diff) | |
| parent | 064b47009cd4278469c245f4dd70e1ce572a6f5d (diff) | |
Merge branch 'master' of coreander:/srv/git/source.jones.dk/local-REDPILL.DK
Diffstat (limited to 'postfix')
| -rwxr-xr-x | postfix/mkpostfixconfig.sh | 10 | ||||
| -rw-r--r-- | postfix/permit_mx_backup_networks | 12 |
2 files changed, 10 insertions, 12 deletions
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 |