From 21f60ecfdfe66e25d7696d1c31715abfaa81af67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xe=CC=81fir=20Destiny?= <xefir@crystalyx.net>
Date: Wed, 5 Oct 2016 22:42:29 +0200
Subject: [PATCH] exim4/folders

---
 exim4/exim4.conf | 8 ++++----
 mailserver.sh    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/exim4/exim4.conf b/exim4/exim4.conf
index c6b22f4..79a8d16 100644
--- a/exim4/exim4.conf
+++ b/exim4/exim4.conf
@@ -4,7 +4,7 @@ SMTP_PORT = 25 : 465 : 587
 LOCAL_INTERFACES = <; ::0 ; 0.0.0.0
 CONFDIR = /etc/exim4
 
-LOCAL_DOMAINS = @:localhost:dsearch;/etc/exim.domains
+LOCAL_DOMAINS = @:localhost:dsearch;/etc/exim4/domains
 ETC_MAILNAME = lsearch;/etc/mailname
 LOCAL_DELIVERY = mail_spool
 CHECK_RCPT_LOCAL_LOCALPARTS = ^[.] : ^.*[@%%!/|`#&?]
@@ -229,15 +229,15 @@ vforward:
   allow_defer
   allow_fail
   domains = +local_domains
-  file = /etc/exim.forward/$local_part@$domain
+  file = /etc/exim4/forward/$local_part@$domain
   file_transport = address_file
   pipe_transport = address_pipe
 
 vdomain:
   debug_print = "R: vdomain for $local_part@$domain"
   driver = accept
-  domains = dsearch;/etc/exim.domains
-  local_parts = lsearch;/etc/exim.domains/$domain
+  domains = dsearch;/etc/exim4/domains
+  local_parts = lsearch;/etc/exim4/domains/$domain
   transport = vmail
 
 dnslookup:
diff --git a/mailserver.sh b/mailserver.sh
index f26c1e7..5e49a9e 100755
--- a/mailserver.sh
+++ b/mailserver.sh
@@ -30,8 +30,8 @@ install_exim() {
     chown -fvR daemon: courier/*
     cp -fv courier/* /etc/courier/
     chown -vR $USER: courier/*
-    mkdir -pv /etc/exim.domains
-    mkdir -pv /etc/exim.forward
+    mkdir -pv /etc/exim4/domains
+    mkdir -pv /etc/exim4/forward
     cp -fv exim4/exim4.conf /etc/exim4/exim4.conf
     chmod -fv 777 /var/run/courier/authdaemon/socket
     /usr/share/doc/exim4-base/examples/exim-gencert