From a8a4de4d9d3eb904e48f6a0303d8761328c2dd6e Mon Sep 17 00:00:00 2001
From: "b.waal" <b.waal79@upcmail.nl>
Date: Sun, 15 Sep 2019 17:09:09 +0200
Subject: [PATCH] Updated menu; SQL and PostfixAdmin

---
 installer.sh | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/installer.sh b/installer.sh
index 398ecdc..2555c63 100644
--- a/installer.sh
+++ b/installer.sh
@@ -63,7 +63,7 @@ dhparam=1024
 ##----------------##
 {
     for ((i = 0 ; i <= 100 ; i+=5)); do
-        sleep 0.3
+        sleep 0.2
         echo $i
     done
 } | whiptail --gauge "Pre-configuring the server..." 6 50 0
@@ -227,41 +227,43 @@ systemctl restart nginx
 ##-----------------------##
 #    MySQL Installation   #
 ##-----------------------##
+whiptail --title "Installing MySQL" --infobox "Busy like a bee" 8 45
 wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-MySQL/raw/branch/master/mysql-8.0.sh -O /tmp/mysql-8.0.sh
-source /tmp/mysql-8.0.sh
+source /tmp/mysql-8.0.sh >/dev/null
 
 ##------------------------------##
 #    MySQL_Secure_Installation   #
 ##------------------------------##
-mysql -u root -p"$password" -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1')"
-mysql -u root -p"$password" -e "DELETE FROM mysql.user WHERE User=''"
-mysql -u root -p"$password" -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\_%'"
-mysql -u root -p"$password" -e "SELECT user,authentication_string,plugin,host FROM mysql.user;"
-mysql -u root -p"$password" -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '"$password"';"
-mysql -u root -p"$password" -e "FLUSH PRIVILEGES;"
+mysql -u root -p"$password" -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1')" >/dev/null
+mysql -u root -p"$password" -e "DELETE FROM mysql.user WHERE User=''" >/dev/null
+mysql -u root -p"$password" -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\_%'" >/dev/null
+mysql -u root -p"$password" -e "SELECT user,authentication_string,plugin,host FROM mysql.user;" >/dev/null
+mysql -u root -p"$password" -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '"$password"';" >/dev/null
+mysql -u root -p"$password" -e "FLUSH PRIVILEGES;" >/dev/null
 
 ##-----------------------------##
 #    MySQL Database Creation    #
 ##-----------------------------##
-mysql -u root -p"$password" -e "CREATE DATABASE postfixadmin;"
-mysql -u root -p"$password" -e "CREATE USER '"postfixadmin"'@'localhost' IDENTIFIED BY '"$password"';"
-mysql -u root -p"$password" -e "GRANT ALL ON "postfixadmin".* TO "postfixadmin"@'localhost';"
-mysql -u root -p"$password" -e "FLUSH PRIVILEGES;"
+mysql -u root -p"$password" -e "CREATE DATABASE postfixadmin;" >/dev/null
+mysql -u root -p"$password" -e "CREATE USER '"postfixadmin"'@'localhost' IDENTIFIED BY '"$password"';" >/dev/null
+mysql -u root -p"$password" -e "GRANT ALL ON "postfixadmin".* TO "postfixadmin"@'localhost';" >/dev/null
+mysql -u root -p"$password" -e "FLUSH PRIVILEGES;" >/dev/null
 
 ##------------------##
 #    PostfixADMIN    #
 ##------------------##
-apt install php${phpver} php${phpver}-zip php${phpver}-fpm php${phpver}-cli php${phpver}-json php${phpver}-mysql php${phpver}-opcache php${phpver}-mbstring php${phpver}-readline -y
-apt install libc-client2007e mlock php${phpver}-common php${phpver}-imap -y
+$PKGM php${phpver} php${phpver}-zip php${phpver}-fpm php${phpver}-cli php${phpver}-json php${phpver}-mysql php${phpver}-opcache php${phpver}-mbstring php${phpver}-readline
+$PKGM libc-client2007e mlock php${phpver}-common php${phpver}-imap
+whiptail --title "Configuring PostfixADMIN" --infobox "Busy like a bee" 8 45
 mkdir -p /var/www/"$domain"/html/postfixadmin/templates_c
 wget -q -t7 https://git.ictmaatwerk.com/downloads/pfa/postfixadmin-3.1.tar.gz -O /tmp/postfixadmin.tar.gz
-tar -xf /tmp/postfixadmin.tar.gz -C /var/www/"$domain"/html/postfixadmin --strip-components=1
+tar -xf /tmp/postfixadmin.tar.gz -C /var/www/"$domain"/html/postfixadmin --strip-components=1  >/dev/null
 chmod 755 -R /var/www/"$domain"/html/postfixadmin/templates_c
 chown -R www-data: /var/www/"$domain"/html/
-wget https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/postfixadmin/config.local.php -O /var/www/$domain/html/postfixadmin/config.local.php
+wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/postfixadmin/config.local.php -O /var/www/$domain/html/postfixadmin/config.local.php
 sed -i -e 's/PASSword/'$password'/' -e 's/dOmaINnamE/'$domonly'/' /var/www/"$domain"/html/postfixadmin/config.local.php
-sudo -u www-data php /var/www/"$domain"/html/postfixadmin/upgrade.php
-bash /var/www/"$domain"/html/postfixadmin/scripts/postfixadmin-cli admin add superadmin@"$domonly" --superadmin 1 --active 1 --password "$password" --password2 "$password"
+sudo -u www-data php /var/www/"$domain"/html/postfixadmin/upgrade.php >/dev/null
+bash /var/www/"$domain"/html/postfixadmin/scripts/postfixadmin-cli admin add superadmin@"$domonly" --superadmin 1 --active 1 --password "$password" --password2 "$password" >/dev/null
 groupadd -g 5000 vmail
 useradd -u 5000 -g vmail -s /usr/sbin/nologin -d /var/mail/vmail -m vmail