From 43e0025c5ef79396bacbd848e701a987ea2febae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xe=CC=81fir=20Destiny?= <xefir@crystalyx.net>
Date: Mon, 15 Aug 2016 22:36:27 +0200
Subject: [PATCH] Remove pop

---
 courier/pop3d     | 14 --------------
 courier/pop3d-ssl | 20 --------------------
 mailserver.sh     |  2 +-
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 courier/pop3d
 delete mode 100644 courier/pop3d-ssl

diff --git a/courier/pop3d b/courier/pop3d
deleted file mode 100644
index 4138a0c..0000000
--- a/courier/pop3d
+++ /dev/null
@@ -1,14 +0,0 @@
-PIDFILE=/var/run/courier/pop3d.pid
-MAXDAEMONS=40
-MAXPERIP=4
-POP3AUTH=""
-POP3AUTH_ORIG="PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
-POP3AUTH_TLS=""
-POP3AUTH_TLS_ORIG="LOGIN PLAIN"
-POP3_PROXY=0
-PORT=110
-ADDRESS=0
-TCPDOPTS="-nodnslookup -noidentlookup"
-LOGGEROPTS="-name=pop3d"
-POP3DSTART=YES
-MAILDIRPATH=Maildir
diff --git a/courier/pop3d-ssl b/courier/pop3d-ssl
deleted file mode 100644
index ce6e7e4..0000000
--- a/courier/pop3d-ssl
+++ /dev/null
@@ -1,20 +0,0 @@
-SSLPORT=995
-SSLADDRESS=0
-SSLPIDFILE=/var/run/courier/pop3d-ssl.pid
-SSLLOGGEROPTS="-name=pop3d-ssl"
-POP3DSSLSTART=YES
-POP3_STARTTLS=YES
-POP3_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/pop3d.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 eb973b1..0e1116f 100755
--- a/mailserver.sh
+++ b/mailserver.sh
@@ -26,7 +26,7 @@ install_exim() {
     install_ask_domain
     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-pop courier-pop-ssl courier-authlib-userdb ssl-cert
+    aptitude -y install exim4 courier-imap courier-imap-ssl courier-authlib-userdb ssl-cert
     chown -fvR daemon: courier/*
     cp -fv courier/* /etc/courier/
     chown -vR $USER: courier/*