From 55a5aff9480786ff1eb6fd3c220c03faa017cb64 Mon Sep 17 00:00:00 2001
From: "b.waal" <b.waal79@upcmail.nl>
Date: Tue, 17 Sep 2019 13:42:33 +0200
Subject: [PATCH] Update 'installer.sh'

---
 installer.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/installer.sh b/installer.sh
index e24a604..ec5b061 100644
--- a/installer.sh
+++ b/installer.sh
@@ -23,7 +23,6 @@ PKGA="add-apt-repository"
 PKGI="${PKGM} install -y"
 
 if [ $IMODE = n ]; then
-TERM=ansi whiptail --title "Ubuntu 18.04 Mail Installer" --infobox "" 8 45
 if (whiptail --title "Ubuntu 18.04 Mail Server" --yesno "Do you want to install a mail server?" 8 78)
     then
         echo "" >/dev/null
@@ -65,13 +64,13 @@ debconf-set-selections <<< "postfix postfix/main_mailer_type string 'Internet Si
 ##----------------##
 #    Pre-Config    #
 ##----------------##
-TERM=ansi whiptail --title "Pre-ConfiguringL" --infobox "Busy like a bee" 8 45
+TERM=ansi whiptail --title "Pre-Configuring" --infobox "Busy like a bee" 8 45
 sleep 2
 hostnamectl set-hostname $domain > $OUTPUT 2>&1
 timedatectl set-timezone Europe/Amsterdam > $OUTPUT 2>&1
-#adduser --system --no-create-home --disabled-password --disabled-login --shell /bin/false --group --home /var/lib/clamav clamav
-#mkdir -p /var/run/clamav
-#chown clamav:clamav /var/run/clamav
+adduser --system --no-create-home --disabled-password --disabled-login --shell /bin/false --group --home /var/lib/clamav clamav
+mkdir -p /var/run/clamav
+chown clamav:clamav /var/run/clamav
 mkdir -p /etc/nginx
 mkdir -p /var/www/"$domain"/html
 chmod -R 755 /var/www
@@ -89,6 +88,7 @@ chmod -R 755 /var/www
 ##----------------------##
 #    Pre-Requirements    #
 ##----------------------##
+TERM=ansi whiptail --title "" --infobox "Busy like a bee" 8 45
 $PKGM update
 $PKGI software-properties-common
 $PKGA universe -y > $OUTPUT 2>&1
@@ -101,7 +101,7 @@ $PKGM upgrade -y
 ##-----------------------------##
 #    Installing Requirements    #
 ##-----------------------------##
-$PKGI nginx php${phpver} php${phpver}-common php${phpver}-imap php${phpver}-zip php${phpver}-fpm php${phpver}-cli php${phpver}-json php${phpver}-mysql php${phpver}-opcache php${phpver}-mbstring php${phpver}-readline libc-client2007e mlock dovecot-imapd dovecot-lmtpd dovecot-pop3d dovecot-mysql dovecot-sieve dovecot-managesieved spamassassin spamc razor pyzor clamav clamav-daemon clamsmtp libclamunrar7 clamdscan amavisd-new zip lrzip liblz4-tool lhasa arj unzip bzip2 nomarch cpio lzop cabextract arc apt-listchanges libauthen-sasl-perl libdbd-mysql-perl libdbi-perl libmail-dkim-perl ripole p7zip p7zip-full p7zip-rar rpm unrar unrar-free altermime libsnmp-perl libnet-ldap-perl libnet-ph-perl libnet-snpp-perl libnet-telnet-perl unzip fail2ban
+$PKGI nginx postfix postfix-mysql php${phpver} php${phpver}-curl php${phpver}-dom php${phpver}-common php${phpver}-imap php${phpver}-zip php${phpver}-fpm php${phpver}-cli php${phpver}-json php${phpver}-mysql php${phpver}-opcache php${phpver}-mbstring php${phpver}-readline libc-client2007e mlock gnupg2 curl dovecot-imapd dovecot-lmtpd dovecot-pop3d dovecot-mysql dovecot-sieve dovecot-managesieved spamassassin spamc razor pyzor clamav clamav-daemon clamsmtp libclamunrar7 clamdscan amavisd-new zip lrzip liblz4-tool lhasa arj unzip bzip2 nomarch cpio lzop cabextract arc apt-listchanges libauthen-sasl-perl libdbd-mysql-perl libdbi-perl libmail-dkim-perl ripole p7zip p7zip-full p7zip-rar rpm unrar unrar-free altermime libsnmp-perl libnet-ldap-perl libnet-ph-perl libnet-snpp-perl libnet-telnet-perl unzip fail2ban
 
 ##-------------##
 #    Debloat    #