aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mc/common.mc28
-rw-r--r--mc/mirddin.mc48
-rw-r--r--mc/relay1.mc47
-rw-r--r--mc/relay2.mc42
-rw-r--r--mc/trurl.mc48
-rw-r--r--mc/ulysses.mc48
6 files changed, 94 insertions, 167 deletions
diff --git a/mc/common.mc b/mc/common.mc
new file mode 100644
index 0000000..756cb94
--- /dev/null
+++ b/mc/common.mc
@@ -0,0 +1,28 @@
+divert(0)
+# $Id$
+divert(-1)
+dnl * To eliminate 8->7 bit base64 enconding
+define(`SMTP_MAILER_FLAGS',`8')
+
+dnl * Do not reveal my version number
+define(`confRECEIVED_HEADER',`$?sfrom $s $.$?_($?s$|from $.$_) $.
+ by $j$?r with $r$. id $i$?u
+ for $u$.; $b')
+dnl * Also, disable HELP,VRFY,EXPN
+define(`HELP_FILE',`none')
+define(`confSMTP_LOGIN_MSG',`$j Sendmail; $b')
+define(`confPRIVACY_FLAGS',`authwarnings,novrfy,noexpn,noetrn,needmailhelo')
+
+define(`confMAX_MESSAGE_SIZE',`5242880')
+
+dnl * File names
+define(`ALIAS_FILE', `/etc/mail/aliases')
+define(`STATUS_FILE', `/etc/mail/sendmail.st')
+define(`confCW_FILE', `-o /etc/mail/sendmail.cw')
+define(`confFORWARD_PATH', `$z/.forward:$z/.forward.$w')
+
+dnl * MSA settings
+DAEMON_OPTIONS(`Name=MTA,Addr=0.0.0.0')
+FEATURE(`no_default_msa')
+DAEMON_OPTIONS(`Port=587,Addr=127.0.0.1, Name=MSA, M=E')
+
diff --git a/mc/mirddin.mc b/mc/mirddin.mc
new file mode 100644
index 0000000..5067a76
--- /dev/null
+++ b/mc/mirddin.mc
@@ -0,0 +1,48 @@
+dnl * Sendmail configuration for Mirddin
+divert(-1)
+
+VERSIONID(`$Id$')
+OSTYPE(linux)dnl
+
+define(`confCF_VERSION',`Mirddin-Gray-$Revision$')
+
+LOCAL_CONFIG
+# Additional header
+HOrganization: Err, what do you mean?
+DUmirddin
+Cwmirddin
+
+dnl * Include common defaults
+include(common.mc)
+
+dnl * Site-specific defines
+define(`confTO_COMMAND', `10m')
+define(`confMAX_DAEMON_CHILDREN',`64')
+define(`confCONNECTION_RATE_THROTTLE',`64')
+define(`confFALLBACK_MX',`relay1.farlep.net')
+
+dnl * Features
+FEATURE(use_cw_file)
+FEATURE(redirect)
+FEATURE(always_add_domain)
+FEATURE(access_db, hash -T<TMPF> -o /etc/mail/access)
+FEATURE(mailertable, hash -o /etc/mail/xroutes)
+FEATURE(domaintable, hash -o /etc/mail/domains)
+FEATURE(virtusertable, hash -o /etc/mail/virtusers)
+FEATURE(blacklist_recipients)
+FEATURE(relay_hosts_only)
+FEATURE(dnsbl, `rbl.maps.vix.com')
+FEATURE(dnsbl, `rbl.farlep.net')
+FEATURE(dnsbl, `dialup-rev.farlep.net')
+
+dnl * Mail filters
+dnl include(mirddin.milter)
+
+dnl * Mailers
+undefine(`LOCAL_MAILER_PATH')
+undefine(`_DEF_LOCAL_MAILER_FLAGS')
+define(`LOCAL_MAILER_PATH', `/usr/local/libexec/mail.local')
+define(`LOCAL_MAILER_ARGS', `mail.local -S %h/.mailutils/filter.sv $u')
+MAILER(local)
+MAILER(smtp)
+
diff --git a/mc/relay1.mc b/mc/relay1.mc
index 9148070..c56a7d3 100644
--- a/mc/relay1.mc
+++ b/mc/relay1.mc
@@ -12,46 +12,10 @@ HOrganization: Farlep-Internet
DUsun
Cwsun
-dnl * To eliminate 8->7 bit base64 enconding
-define(`SMTP_MAILER_FLAGS',`8')
-define(`ALIAS_FILE', `/etc/mail/aliases')
-
-dnl * Do not reveal my version number
-define(`confRECEIVED_HEADER',`$?sfrom $s $.$?_($?s$|from $.$_) $.
- by $j$?r with $r$. id $i$?u
- for $u$.; $b')
-dnl * Also, disable HELP,VRFY,EXPN
-define(`HELP_FILE',`none')
-define(`confSMTP_LOGIN_MSG',`$j Sendmail; $b')
-define(`confPRIVACY_FLAGS',`authwarnings,novrfy,noexpn,noetrn')
-
-define(`confMAX_MESSAGE_SIZE',`5242880')
-define(`confMESSAGE_TIMEOUT',`7d/3d')
-define(`confTO_INITIAL', `5m')
-define(`confTO_IDENT', `25s')
-define(`confTO_HELO', `5m')
-define(`confTO_MAIL', `15m')
-define(`confTO_RCPT', `60m')
-define(`confTO_DATAINIT', `5m')
-define(`confTO_DATABLOCK',`30m')
-define(`confTO_DATAFINAL',`40m')
-define(`confTO_RSET', `5m')
-define(`confTO_QUIT', `2m')
-define(`confTO_MISC', `2m')
-define(`confTO_COMMAND', `30m')
-define(`confREFUSE_LA',`16')
-define(`confQUEUE_LA',`25')
-define(`confMAX_DAEMON_CHILDREN',`256')
-define(`confCONNECTION_RATE_THROTTLE',`128')
-define(`confCHECK_ALIASES',`False')
-define(`confCW_FILE', `-o /etc/mail/sendmail.cw')
-define(`confFORWARD_PATH', `$z/.forward:$z/.forward.$w')
-define(`confTRY_NULL_MX_LIST')
-define(`confDEAD_LETTER_DROP', `/var/spool/mail/dead.letter')
-define(`confFALLBACK_MX',`relay1.farlep.net')
-
-define(`STATUS_FILE', `/etc/mail/sendmail.st')
+dnl * Include common defaults
+include(common.mc)
+dnl * Features
FEATURE(use_cw_file)
FEATURE(redirect)
FEATURE(always_add_domain)
@@ -61,6 +25,8 @@ FEATURE(domaintable, hash -o /etc/mail/domains)
FEATURE(virtusertable, hash -o /etc/mail/virtusers)
FEATURE(relay_entire_domain)
FEATURE(blacklist_recipients)
+
+dnl * RBL configuration
FEATURE(dnsbl,`dialups.mail-abuse.org',` Mail from dial-up rejected; see http://mail-abuse.org/dul/enduser.htm')
FEATURE(dnsbl, `rbl.farlep.net', ` Stop SPAM from this host')
FEATURE(dnsbl, `dyn-rbl.farlep.net', ` E-Cards are not allowed to use SMTP')
@@ -115,9 +81,6 @@ Mlocal-sql, P=/usr/local/libexec/mail.local, F=lsDFMA5:/|@qSPfhn9, S=EnvFromL/Hd
LOCAL_RULESETS
-#SLocal_check_mail
-#R<> $#discard
-
SLocal_check_rcpt
# check address against various regex checks
R$* $: $>Parse0 $1
diff --git a/mc/relay2.mc b/mc/relay2.mc
index d41ef15..4b864dc 100644
--- a/mc/relay2.mc
+++ b/mc/relay2.mc
@@ -12,44 +12,10 @@ HOrganization: ISP Farlep (Odessa)
DUtor
Cwtor
-dnl * To eliminate 8->7 bit base64 enconding
-define(`SMTP_MAILER_FLAGS',`8')
-define(`ALIAS_FILE', `/etc/mail/aliases')
-
-dnl * Do not reveal my version number
-define(`confRECEIVED_HEADER',`$?sfrom $s $.$?_($?s$|from $.$_) $.
- by $j$?r with $r$. id $i$?u
- for $u$.; $b')
-dnl * Also, disable HELP,VRFY,EXPN
-define(`HELP_FILE',`none')
-define(`confSMTP_LOGIN_MSG',`$j Sendmail; $b')
-define(`confPRIVACY_FLAGS',`authwarnings,novrfy,noexpn,noetrn,needmailhelo')
-
-define(`confMAX_MESSAGE_SIZE',`5242880')
-define(`confMESSAGE_TIMEOUT',`7d/3d')
-define(`confTO_INITIAL', `5m')
-define(`confTO_IDENT', `25s')
-define(`confTO_HELO', `5m')
-define(`confTO_MAIL', `15m')
-define(`confTO_RCPT', `60m')
-define(`confTO_DATAINIT', `5m')
-define(`confTO_DATABLOCK',`30m')
-define(`confTO_DATAFINAL',`40m')
-define(`confTO_RSET', `5m')
-define(`confTO_QUIT', `2m')
-define(`confTO_MISC', `2m')
-define(`confTO_COMMAND', `30m')
-define(`confREFUSE_LA',`16')
-define(`confQUEUE_LA',`25')
-define(`confMAX_DAEMON_CHILDREN',`64')
-define(`confCONNECTION_RATE_THROTTLE',`64')
-define(`confCHECK_ALIASES',`False')
-define(`confCW_FILE', `-o /etc/mail/sendmail.cw')
-define(`confFORWARD_PATH', `$z/.forward:$z/.forward.$w')
-define(`confTRY_NULL_MX_LIST')
-
-define(`STATUS_FILE', `/etc/mail/sendmail.st')
+dnl * Include common defaults
+include(common.mc)
+dnl * Features
FEATURE(use_cw_file)
FEATURE(redirect)
FEATURE(always_add_domain)
@@ -75,8 +41,10 @@ POPDIVERT
FEATURE(dnsbl, `rbl.farlep.net', `"Stop SPAM from this host"')
FEATURE(dnsbl, `bl.spamcop.net', `"Spam blocked see; http://spamcop.net/bl.shtml?"$&{client_addr}')
+dnl * Milter configuration
include(`milter.conf')
+dnl * Mailers
undefine(`LOCAL_MAILER_PATH')
define(`LOCAL_MAILER_PATH', `/usr/local/libexec/mail.local')
define(`LOCAL_MAILER_ARGS', `Mail -xt -S /home/%u/.Sieve $u')
diff --git a/mc/trurl.mc b/mc/trurl.mc
index 2f60cc0..8ed304d 100644
--- a/mc/trurl.mc
+++ b/mc/trurl.mc
@@ -12,50 +12,10 @@ HOrganization: GNU.ORG.UA
DUtrurl
Cwtrurl
-dnl * To eliminate 8->7 bit base64 enconding
-define(`SMTP_MAILER_FLAGS',`8')
-define(`ALIAS_FILE', `/etc/mail/aliases')
-
-dnl * Do not reveal my version number
-define(`confRECEIVED_HEADER',`$?sfrom $s $.$?_($?s$|from $.$_) $.
- by $j$?r with $r$. id $i$?u
- for $u$.; $b')
-dnl * Also, disable HELP,VRFY,EXPN
-define(`HELP_FILE',`none')
-define(`confSMTP_LOGIN_MSG',`$j server; $b')
-define(`confPRIVACY_FLAGS',`authwarnings,novrfy,noexpn,noetrn,needmailhelo')
-
-define(`confMAX_MESSAGE_SIZE',`5242880')
-define(`confMESSAGE_TIMEOUT',`7d/3d')
-define(`confTO_INITIAL', `5m')
-define(`confTO_IDENT', `25s')
-define(`confTO_HELO', `5m')
-define(`confTO_MAIL', `15m')
-define(`confTO_RCPT', `60m')
-define(`confTO_DATAINIT', `5m')
-define(`confTO_DATABLOCK',`30m')
-define(`confTO_DATAFINAL',`40m')
-define(`confTO_RSET', `5m')
-define(`confTO_QUIT', `2m')
-define(`confTO_MISC', `2m')
-define(`confTO_COMMAND', `30m')
-define(`confREFUSE_LA',`16')
-define(`confQUEUE_LA',`25')
-define(`confMAX_DAEMON_CHILDREN',`256')
-define(`confCONNECTION_RATE_THROTTLE',`128')
-define(`confCHECK_ALIASES',`False')
-define(`confCW_FILE', `-o /etc/mail/sendmail.cw')
-define(`confFORWARD_PATH', `$z/.forward:$z/.forward.$w')
-define(`confTRY_NULL_MX_LIST')
-define(`confDEAD_LETTER_DROP', `/var/spool/mail/dead.letter')
-define(`confFALLBACK_MX',`relay1.farlep.net')
-
-DAEMON_OPTIONS(`Name=MTA,Addr=0.0.0.0')
-FEATURE(`no_default_msa')
-DAEMON_OPTIONS(`Port=587,Addr=127.0.0.1, Name=MSA, M=E')
-
-define(`STATUS_FILE', `/etc/mail/sendmail.st')
+dnl * Include common defaults
+include(common.mc)
+dnl * Features
FEATURE(use_cw_file)
FEATURE(redirect)
FEATURE(always_add_domain)
@@ -79,6 +39,6 @@ define(`LOCAL_MAILER_ARGS', `mail.local -xl -S %h/.filter.sv $u')
MAILER(local)
MAILER(smtp)
-dnl * Identification string for mail.local/Sieve log messages.ma
+dnl * Identification string for mail.local/Sieve log messages.
LOCAL_CONFIG
HX-Mailutils-Message-Id: $i$?u
diff --git a/mc/ulysses.mc b/mc/ulysses.mc
index b7fd450..5d6d1c1 100644
--- a/mc/ulysses.mc
+++ b/mc/ulysses.mc
@@ -7,60 +7,20 @@ OSTYPE(linux)dnl
define(`confCF_VERSION',`Ulysses.gnu.org.ua $Revision$')
-dnl * To eliminate 8->7 bit base64 enconding
-define(`SMTP_MAILER_FLAGS',`8')
-define(`ALIAS_FILE', `/etc/mail/aliases')
-
-dnl * Do not reveal my version number
-define(`confRECEIVED_HEADER',`$?sfrom $s $.$?_($?s$|from $.$_) $.
- by $j$?r with $r$. id $i$?u
- for $u$.; $b')
-
-dnl * Identification string for mail.local/Sieve log messages.ma
LOCAL_CONFIG
+dnl * Identification string for mail.local/Sieve log messages.
HX-Mailutils-Message-Id: $i$?u
# Additional header
HOrganization: Err, what do you mean?
DUulysses
Cwulysses
-
-dnl * Also, disable HELP,VRFY,EXPN
-define(`HELP_FILE',`none')
-define(`confSMTP_LOGIN_MSG',`$j server; $b')
-define(`confPRIVACY_FLAGS',`authwarnings,novrfy,noexpn,noetrn,needmailhelo')
-
-define(`confMAX_MESSAGE_SIZE',`5242880')
-define(`confMESSAGE_TIMEOUT',`7d/3d')
-define(`confTO_INITIAL', `35m')
-define(`confTO_IDENT', `0m')
-define(`confTO_HELO', `35m')
-define(`confTO_MAIL', `35m')
-define(`confTO_RCPT', `64m')
-define(`confTO_DATAINIT', `35m')
-define(`confTO_DATABLOCK',`64m')
-define(`confTO_DATAFINAL',`40m')
-define(`confTO_RSET', `40m')
-define(`confTO_QUIT', `40m')
-define(`confTO_MISC', `25m')
-define(`confTO_COMMAND', `40m')
-define(`confREFUSE_LA',`16')
-define(`confQUEUE_LA',`25')
-define(`confMAX_DAEMON_CHILDREN',`32')
-define(`confCONNECTION_RATE_THROTTLE',`64')
-define(`confCHECK_ALIASES',`False')
-define(`confCW_FILE', `-o /etc/mail/sendmail.cw')
-define(`confFORWARD_PATH', `$z/.forward:$z/.forward.$w')
-define(`confTRY_NULL_MX_LIST')
-
-DAEMON_OPTIONS(`Name=MTA,Addr=0.0.0.0')
-FEATURE(`no_default_msa')
-DAEMON_OPTIONS(`Port=587,Addr=127.0.0.1, Name=MSA, M=E')
+dnl * Include common defaults
+include(common.mc)
dnl define(`confFALLBACK_MX',`relay1.farlep.net')
-define(`STATUS_FILE', `/etc/mail/sendmail.st')
-
+dnl * Features
FEATURE(use_cw_file)
FEATURE(redirect)
FEATURE(always_add_domain)

Return to:

Send suggestions and report system problems to the System administrator.

Generated by cgit.