It's not much good otherwise.
MODES += usersat
OPTIONS_usersat = auth.m4 local.m4 satellite.m4
+-include site.mk
-include local.mk
###--------------------------------------------------------------------------
${if DKIM_SIGN_P \
{DKIM_KEYS_INFO(<:m4_dnl
{X-CONF_header_token-DKIM-Key-Publication: \
- DKIM signature not suitable for \
- as evidence after delivery; \
+ DKIM signature not suitable \
+ as evidence after delivery;\n\t\
DKIM private key KV(k) will be \
- published at KV(u) on or before \
- KV(tpub)}:>)}}:>)
+ published\n\t\
+ at KV(u)\n\t\
+ on or before KV(tpub)}:>)}}:>)
+
m4_define(<:SMTP_DELIVERY:>,
<:## Prevent sending messages with overly long lines. The use of
## Other hosts allowed to relay mail through us.
DEFCONF(relay_clients, <m4_dnl
-; +trusted m4_dnl
+; +allnets m4_dnl
; 172.31.80.8 m4_dnl chiark (VPN)
-; 172.29.198.161 ; 2001:8b0:c92:a000::1:1 m4_dnl national
)
## DKIM headers list.
## Surprise! Internal whitespace isn't allowed here.
-DEFCONF(dkim_headers,m4_dnl
-References:In-Reply-To:Subject:To:Date:Message-ID:m4_dnl
-From:Sender:Reply-To:Cc:m4_dnl
-Content-Transfer-Encoding:Content-Type:MIME-Version:m4_dnl
-Content-ID:Content-Description)
+DEFCONF(dkim_headers, m4_dnl
+References : In-Reply-To : Subject : To : Date : Message-ID : m4_dnl
+From : Sender : Reply-To : Cc : m4_dnl
+Content-Transfer-Encoding : Content-Type : MIME-Version : m4_dnl
+Content-ID : Content-Description m4_dnl
+)
## TLS certificate list.
DEFCONF(certlist,
SECTION(routers, alias-opts)m4_dnl
## Only expand aliases for our home domain.
- domains = +thishost
+ domains = CONF_master_domain : +thishost
SECTION(routers, smarthost)m4_dnl
satellite:
--- /dev/null
+### -*-makefile-*-
+
+HOSTS_hub += stratocaster
+
+HOSTS_srv += telecaster
+
+HOSTS_usersat += jem artist jazz #vampire
+
+HOSTS_satellite += gibson spirit #crybaby
+HOSTS_satellite += ibanez radius roadstar universe
+HOSTS_satellite += fender precision
+HOSTS_satellite += eggle national
+HOSTS_satellite += groove
## If the client is trusted, or this is a new submission, don't
## bother with any of this. We will have verified the sender
## fairly aggressively before granting this level of trust.
- accept hosts = +trusted
+ accept hosts = CONF_relay_clients
accept condition = ${if eq{$acl_c_mode}{submission}}
## If all domains have disabled spam checking then don't check.