Untrack apache2/vhosts. Separate system and hosted aliases.

diff --git a/conf.d/router/450_exim4-config_default_aliases b/conf.d/router/450_exim4-config_default_aliases
deleted file mode 100644 (file)
index 8050d5f..0000000
--- a/conf.d/router/450_exim4-config_default_aliases
+++ /dev/null
@@ -1,25 +0,0 @@
-# hcoop-change: New rule which specifies the fallback person to send
-# mail to for a domain.
-
-default_aliases:
-  debug_print = "R: default_aliases for $local_part@$domain"
-  driver = redirect
-  domains = +local_domains
-  allow_fail
-  allow_defer
-  data = ${lookup{$local_part@$domain}lsearch*@{/etc/aliases.default}}
-  .ifdef SYSTEM_ALIASES_USER
-  user = SYSTEM_ALIASES_USER
-  .endif
-  .ifdef SYSTEM_ALIASES_GROUP
-  group = SYSTEM_ALIASES_GROUP
-  .endif
-  .ifdef SYSTEM_ALIASES_FILE_TRANSPORT
-  file_transport = SYSTEM_ALIASES_FILE_TRANSPORT
-  .endif
-  .ifdef SYSTEM_ALIASES_PIPE_TRANSPORT
-  pipe_transport = SYSTEM_ALIASES_PIPE_TRANSPORT
-  .endif
-  .ifdef SYSTEM_ALIASES_DIRECTORY_TRANSPORT
-  directory_transport = SYSTEM_ALIASES_DIRECTORY_TRANSPORT
-  .endif

diff --git a/conf.d/router/420_exim4-config_hosted_aliases b/conf.d/router/450_exim4-config_hosted_aliases
similarity index 93%
rename from conf.d/router/420_exim4-config_hosted_aliases
rename to conf.d/router/450_exim4-config_hosted_aliases
index 42c8b07..630a494 100644 (file)
--- a/conf.d/router/420_exim4-config_hosted_aliases
+++ b/conf.d/router/450_exim4-config_hosted_aliases
@@ -16,7 +16,7 @@ hosted_aliases:
   domains = +local_domains
   allow_fail
   allow_defer
-  data = ${lookup{$local_part@$domain}lsearch{/etc/aliases.hosted}}
+  data = ${lookup{$local_part@$domain}lsearch*@{/etc/aliases.hosted}}
   .ifdef SYSTEM_ALIASES_USER
   user = SYSTEM_ALIASES_USER
   .endif