desiato as real mail host

diff --git a/sites/desiato b/sites/desiato
index 47d1becfd688077f63c095d06eaaf31978be5835..154fd4b2807b405ce4fd6f9a1cbe9269fdb61064 100644 (file)
--- a/sites/desiato
+++ b/sites/desiato
@@ -1,85 +1,29 @@
-primary_hostname = desiato.infradead.org
+# $Id: bombadil,v 1.2 2007/11/25 15:47:59 dwmw2 Exp $
 
-# Listen only on localhost
-local_interfaces = <;   127.0.0.1 ; ::1
+.ifndef CONFDIR
+CONFDIR=/etc/exim
+.endif
 
-queue_list_requires_admin = false
+CLUSTER=CONFDIR/infradead
 
-qualify_domain = infradead.org
-
-trusted_users = mail
-never_users = root
-
-gecos_pattern = ^([^,:]*)
-gecos_name = $1
-
-log_selector =  \
-              +address_rewrite \
-              +smtp_confirmation \
-              +smtp_protocol_error \
-             +smtp_syntax_error \
-             +sender_on_delivery
-
-smtp_return_error_details = true
-accept_8bitmime
-tls_advertise_hosts = *
-tls_certificate = /usr/share/ssl/certs/exim.pem
-tls_privatekey = /usr/share/ssl/certs/exim.pem
-
-acl_smtp_rcpt = accept
-acl_smtp_data = check_content_shinybook
-
-freeze_tell = postmaster@infradead.org
-allow_domain_literals
-
-ignore_bounce_errors_after = 3d
-timeout_frozen_after = 14d
-
-.include /etc/exim/authclient
+DKIM_SELECTOR=merlin.20200630
 
-begin acl
+#MAILMAN_HOME=/var/lib/mailman
+#MAILMAN_WRAP=/usr/lib/mailman/mail/mailman
+#MAILMAN_UID=mailman
+#MAILMAN_GID=mailman
 
-check_content_shinybook:
-  warn  condition = ${if !def:h_Message-ID: {1}}
-       message = Message-ID: <E$message_id@$primary_hostname>
-  warn  condition = ${if !def:h_Date: {1}}
-       message = Date: $tod_full
-  warn  condition = ${if !def:h_From: {1}}
-       message = From: ${if eq{$sender_address}{} \
-                               {MAILER-DAEMON <postmaster@infradead.org>}\
-                               {$sender_address}}
-  accept
+DNS_VIRTUAL=CLUSTER/dns-virtual-domains
 
-begin authenticators
-
-infradead_auth:
-  driver = cram_md5
-  public_name = CRAM-MD5
-  client_name = SMTPAUTH_USERNAME
-  client_secret = SMTPAUTH_PASSWORD
-
-begin routers
-
-#redhat_internal:
-#  driver = dnslookup
-#  transport = remote_smtp
-#  domains = redhat.com : *.redhat.com
-
-everything:
-  driver = manualroute
-  route_data = smtpauth.infradead.org
-  transport = remote_msa
-
-begin transports
-
-remote_smtp:
-  driver = smtp
-
-remote_msa:
-  driver = smtp
-  port = 587
-  hosts_require_auth = *
+CRM114=CRM114
+spamd_address = ${if def:acl_m_spamd_address {$acl_m_spamd_address} {127.0.0.1 783}}
 
+domainlist extra_local_domains =
+hostlist relay_hosts = <; localhost ; ::1 ;
+qualify_domain = infradead.org
+daemon_smtp_port = smtp : msa : 465
+tls_on_connect_ports = 465
+.include CONFDIR/master
 
 begin rewrite
-backuppc@infradead.org dwmw2-forward@infradead.org F
+