From 962a9994ca767b43479f4c29c1cc7f65c7f2e751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xe=CC=81fir=20Destiny?= <xefir@crystalyx.net>
Date: Sat, 15 Oct 2016 11:44:57 +0200
Subject: [PATCH] drop file requirements for courier, fix relay_from_domains,
 .... see previous commit

---
 README.md            |  4 ++++
 courier/authdaemonrc |  6 ------
 courier/imapd        | 32 --------------------------------
 courier/imapd-ssl    | 20 --------------------
 mailserver.sh        |  5 ++---
 5 files changed, 6 insertions(+), 61 deletions(-)
 delete mode 100644 courier/authdaemonrc
 delete mode 100644 courier/imapd
 delete mode 100644 courier/imapd-ssl

diff --git a/README.md b/README.md
index 462a583..35957ef 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,5 @@
 # Exim
+
+## TODO
+
+- Courier config modification
diff --git a/courier/authdaemonrc b/courier/authdaemonrc
deleted file mode 100644
index b50f403..0000000
--- a/courier/authdaemonrc
+++ /dev/null
@@ -1,6 +0,0 @@
-authmodulelist="authuserdb authpam"
-daemons=5
-authdaemonvar=/var/run/courier/authdaemon
-DEBUG_LOGIN=0
-DEFAULTOPTIONS=""
-LOGGEROPTS=""
diff --git a/courier/imapd b/courier/imapd
deleted file mode 100644
index 9378c2c..0000000
--- a/courier/imapd
+++ /dev/null
@@ -1,32 +0,0 @@
-ADDRESS=0
-PORT=143
-MAXDAEMONS=40
-MAXPERIP=20
-PIDFILE=/var/run/courier/imapd.pid
-TCPDOPTS="-nodnslookup -noidentlookup"
-LOGGEROPTS="-name=imapd"
-IMAP_CAPABILITY="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE"
-IMAP_KEYWORDS=1
-IMAP_ACL=1
-IMAP_CAPABILITY_ORIG="IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
-IMAP_PROXY=0
-IMAP_PROXY_FOREIGN=0
-IMAP_IDLE_TIMEOUT=60
-IMAP_MAILBOX_SANITY_CHECK=1
-IMAP_CAPABILITY_TLS="$IMAP_CAPABILITY AUTH=PLAIN"
-IMAP_CAPABILITY_TLS_ORIG="$IMAP_CAPABILITY_ORIG AUTH=PLAIN"
-IMAP_DISABLETHREADSORT=0
-IMAP_CHECK_ALL_FOLDERS=0
-IMAP_OBSOLETE_CLIENT=0
-IMAP_UMASK=022
-IMAP_ULIMITD=131072
-IMAP_USELOCKS=1
-IMAP_SHAREDINDEXFILE=/etc/courier/shared/index
-IMAP_ENHANCEDIDLE=0
-IMAP_TRASHFOLDERNAME=Trash
-IMAP_EMPTYTRASH=Trash:7
-IMAP_MOVE_EXPUNGE_TO_TRASH=0
-SENDMAIL=/usr/sbin/sendmail
-HEADERFROM=X-IMAP-Sender
-IMAPDSTART=YES
-MAILDIRPATH=Maildir
diff --git a/courier/imapd-ssl b/courier/imapd-ssl
deleted file mode 100644
index 5722c97..0000000
--- a/courier/imapd-ssl
+++ /dev/null
@@ -1,20 +0,0 @@
-SSLPORT=993
-SSLADDRESS=0
-SSLPIDFILE=/var/run/courier/imapd-ssl.pid
-SSLLOGGEROPTS="-name=imapd-ssl"
-IMAPDSSLSTART=YES
-IMAPDSTARTTLS=YES
-IMAP_TLS_REQUIRED=0
-COURIERTLS=/usr/bin/couriertls
-TLS_PROTOCOL=TLS1
-TLS_STARTTLS_PROTOCOL=TLS1
-TLS_KX_LIST=ALL
-TLS_COMPRESSION=ALL
-TLS_CERTS=X509
-TLS_CERTFILE=/etc/courier/imapd.pem
-TLS_DHPARAMS=/etc/courier/dhparams.pem
-TLS_TRUSTCERTS=/etc/ssl/certs
-TLS_VERIFYPEER=NONE
-TLS_CACHEFILE=/var/lib/courier/couriersslcache
-TLS_CACHESIZE=524288
-MAILDIRPATH=Maildir
diff --git a/mailserver.sh b/mailserver.sh
index a4fa112..eedf14c 100755
--- a/mailserver.sh
+++ b/mailserver.sh
@@ -19,15 +19,14 @@ install_exim() {
     echo -e "${YEL}Two boxes will appear. Hit [Enter] each time to continue.${STD}"
     read -p "Press [Enter] key to continue..."
     aptitude -y install exim4 courier-imap courier-imap-ssl courier-authlib-userdb ssl-cert sudo openssl
-    chown -fvR daemon: courier/*
-    cp -fv courier/* /etc/courier/
-    chown -vR $USER: courier/*
     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
     chmod -fv 777 /var/run/courier/authdaemon/socket
     /usr/share/doc/exim4-base/examples/exim-gencert
     openssl genrsa -out /etc/exim4/dkim.key 2048
+    openssl dhparam -out /etc/courier/dhparams.pem 2048
     install_restart
 }