summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
adf15c3)
* Do smarthost relaying after alias processing, by adding a new
diversion for it, rather than reusing the `routers/remote'
diversion.
* Move alias processing to `base.m4', and include a new diversion for
additional options.
* Have `satellite.m4' attach a `domains' condition to the alias
processing, so that we only do this for more-or-less local
addresses.
verify = no
FILTER_TRANSPORTS<::>$4:>)
verify = no
FILTER_TRANSPORTS<::>$4:>)
+DIVERT(null)
+###--------------------------------------------------------------------------
+### Common routers.
+
+SECTION(routers, alias)m4_dnl
+## Look up the local part in the address map.
+alias:
+ driver = redirect
+ allow_fail = true
+ allow_defer = true
+ user = CONF_filter_user
+ FILTER_TRANSPORTS
+ local_parts = nwildlsearch; CONF_alias_file
+ data = ${expand:$local_part_data}
+SECTION(routers, alias-opts)m4_dnl
+
DIVERT(null)
###--------------------------------------------------------------------------
### Some standard transports.
DIVERT(null)
###--------------------------------------------------------------------------
### Some standard transports.
DEFDIVERSION(routers/virtual-tail, 412)
DEFDIVERSION(routers/real, 414)
DEFDIVERSION(routers/alias, 416)
DEFDIVERSION(routers/virtual-tail, 412)
DEFDIVERSION(routers/real, 414)
DEFDIVERSION(routers/alias, 416)
-DEFDIVERSION(routers/allspam, 418)
-DEFDIVERSION(routers/dispatch, 420)
-DEFDIVERSION(routers/forward, 422)
-DEFDIVERSION(routers/deliver, 424)
+DEFDIVERSION(routers/alias-opts, 418)
+DEFDIVERSION(routers/smarthost, 420)
+DEFDIVERSION(routers/allspam, 422)
+DEFDIVERSION(routers/dispatch, 424)
+DEFDIVERSION(routers/forward, 426)
+DEFDIVERSION(routers/deliver, 428)
DEFDIVERSION(transports, 500)
DEFDIVERSION(transports, 500)
###--------------------------------------------------------------------------
### Forwarding and redirection for incoming mail.
###--------------------------------------------------------------------------
### Forwarding and redirection for incoming mail.
-SECTION(routers, alias)m4_dnl
-## Look up the local part in the address map.
-alias:
- driver = redirect
- allow_fail = true
- allow_defer = true
- user = CONF_filter_user
- FILTER_TRANSPORTS
- local_parts = nwildlsearch; CONF_alias_file
- data = ${expand:$local_part_data}
-
SECTION(routers, real)m4_dnl
## A special hack to get mail to a user who has a forward file. Only for
## special effects.
SECTION(routers, real)m4_dnl
## A special hack to get mail to a user who has a forward file. Only for
## special effects.
deny message = This is not a public mail server
hosts = ! +allnets
deny message = This is not a public mail server
hosts = ! +allnets
-SECTION(routers, remote)m4_dnl
+SECTION(routers, alias-opts)
+ ## Only expand aliases for our home domain.
+ domains = +thishost
+DIVERT(null)
+
+SECTION(routers, smarthost)m4_dnl
satellite:
driver = manualroute
transport = smtp_local
satellite:
driver = manualroute
transport = smtp_local