sites-available/default.
* apache2/sites-available/default: Migrate, but comment out, some
settings.
* default/hdparm, default/hotplug: Remove, since no longer installed.
* exim4/conf.d/main/01_exim4-config_listmacrosdefs: Add new domainlist
unix_domains, which are the only domains that we permit delivery of
local mail to, after resolving aliases.
* exim4/conf.d/router/300_exim4-config_real_local (real_local): Use
unix_domains.
* exim4/conf.d/router/400_exim4-config_system_aliases (system_aliases):
Look up both local_part and domain, not just local_part.
* exim4/conf.d/router/550_exim4-get_token: Remove, since it isn't used.
* exim4/conf.d/router/600_exim4-config_userforward (userforward): Use
unix_domains.
* exim4/conf.d/router/700_exim4-config_procmail (procmail): Ditto.
* exim4/conf.d/router/800_exim4-config_maildrop (maildrop): Ditto.
* exim4/conf.d/router/900_exim4-config_local_user (local_user): Ditto.
* init.d/courier-authdaemon: Make sure this never runs.
* init.d/courier-imap, init.d/courier-imap-ssl, init.d/courier-pop:
init.d/courier-pop-ssl: Ditto.
* mailman: Record file permissions. Yay, git!
* pam.d/common-account: Add emergency line.
* pam.d/common-auth: Ditto.
* spamassassin/local.cf: Set report_safe to 0 to get rid of pointless
report.
* sudoers: Temporarily set us to ADMIN_NOPASS.
#.endif
#domainlist relay_to_domains = MAIN_RELAY_TO_DOMAINS
+# hcoop-change: List of domains that accept mail from local users.
+# Mail sent to other domains we manage will be transformed into a
+# local address by /etc/aliases.
+domainlist unix_domains = deleuze.hcoop.net:localhost
+
# List of sender networks (IP addresses) to _unconditionally_ relay
# _for_. If you intend to be SMTP AUTH server, you do not need to enter
# anything here.
# processing. This can be used to inform a user of a broken .forward
# file, for example. The userforward router does this.
+# hcoop-change: Use unix_domains rather than local_domains.
+
real_local:
debug_print = "R: real_local for $local_part@$domain"
driver = accept
- domains = +local_domains
+ domains = +unix_domains
local_part_prefix = real-
check_local_user
transport = LOCAL_DELIVERY
# /usr/share/doc/exim4-base/README.Debian.gz
# for explanation and some workarounds.
+# hcoop-change: Look up the local_part and domain, not just the
+# local_part.
+
system_aliases:
debug_print = "R: system_aliases for $local_part@$domain"
driver = redirect
domains = +local_domains
allow_fail
allow_defer
- data = ${lookup{$local_part}lsearch{/etc/aliases}}
+ data = ${lookup{$local_part@$domain}lsearch{/etc/aliases}}
.ifdef SYSTEM_ALIASES_USER
user = SYSTEM_ALIASES_USER
.endif
+++ /dev/null
-# hcoop-change: acquire AFS token for the user -- the condition
-# statement is executed for side-effects only, and nothing should ever
-# be accepted by this router
-#
-# Currently disabled in favor of getting the token during transport --
-# that is, after changing uid.
-
-# get_token:
-# driver = accept
-# domains = +local_domains
-# condition = ${run{/etc/exim4/get-token ${local_part}}{0}{0}}
-# transport = dev_null
-# no_verify
-# no_expn
# The four transports specified at the end are those that are used when
# forwarding generates a direct delivery to a directory, or a file, or to a
# pipe, or sets up an auto-reply, respectively.
+
+# hcoop-change: Use unix_domains rather than local_domains.
+
userforward:
debug_print = "R: userforward for $local_part@$domain"
driver = redirect
- domains = +local_domains
+ domains = +unix_domains
check_local_user
file = $home/.forward
require_files = $local_part:$home/.forward
+# hcoop-change: Use unix_domains rather than local_domains.
+
procmail:
debug_print = "R: procmail for $local_part@$domain"
driver = accept
- domains = +local_domains
+ domains = +unix_domains
check_local_user
transport = procmail_pipe
# emulate OR with "if exists"-expansion
### router/800_exim4-config_maildrop
#################################
+# hcoop-change: Use unix_domains rather than local_domains.
+
maildrop:
debug_print = "R: maildrop for $local_part@$domain"
driver = accept
- domains = +local_domains
+ domains = +unix_domains
check_local_user
transport = maildrop_pipe
require_files = ${local_part}:${home}/.mailfilter:+/usr/bin/maildrop
# This router matches local user mailboxes. If the router fails, the error
# message is "Unknown user".
+# hcoop-change: Use unix_domains rather than local_domains.
+
local_user:
debug_print = "R: local_user for $local_part@$domain"
driver = accept
- domains = +local_domains
+ domains = +unix_domains
check_local_user
local_parts = ! root
transport = LOCAL_DELIVERY