Sync with upstream development branch

Kristan Kenney · Kristan Kenney · commit d0bae9580604 · 2019-04-20T08:40:56.000-04:00
diff --git a/install/deb/multiphp/apache2/PHP-56.sh b/install/deb/multiphp/apache2/PHP-56.sh
@@ -11,7 +11,7 @@ pool_conf="[$2]
 listen = /run/php/php5.6-fpm-$2.sock
 listen.owner = $1
 listen.group = $1
-listen.mode = 0666
+listen.mode = 0660
 
 user = $1
 group = $1
diff --git a/install/deb/multiphp/apache2/PHP-70.sh b/install/deb/multiphp/apache2/PHP-70.sh
@@ -11,7 +11,7 @@ pool_conf="[$2]
 listen = /run/php/php7.0-fpm-$2.sock
 listen.owner = $1
 listen.group = $1
-listen.mode = 0666
+listen.mode = 0660
 
 user = $1
 group = $1
diff --git a/install/deb/multiphp/apache2/PHP-71.sh b/install/deb/multiphp/apache2/PHP-71.sh
@@ -11,7 +11,7 @@ pool_conf="[$2]
 listen = /run/php/php7.1-fpm-$2.sock
 listen.owner = $1
 listen.group = $1
-listen.mode = 0666
+listen.mode = 0660
 
 user = $1
 group = $1
diff --git a/install/deb/multiphp/apache2/PHP-72.sh b/install/deb/multiphp/apache2/PHP-72.sh
@@ -11,7 +11,7 @@ pool_conf="[$2]
 listen = /run/php/php7.2-fpm-$2.sock
 listen.owner = $1
 listen.group = $1
-listen.mode = 0666
+listen.mode = 0660
 
 user = $1
 group = $1
diff --git a/install/deb/multiphp/apache2/PHP-73.sh b/install/deb/multiphp/apache2/PHP-73.sh
@@ -11,7 +11,7 @@ pool_conf="[$2]
 listen = /run/php/php7.3-fpm-$2.sock
 listen.owner = $1
 listen.group = $1
-listen.mode = 0666
+listen.mode = 0660
 
 user = $1
 group = $1
diff --git a/install/deb/multiphp/nginx/PHP-56.sh b/install/deb/multiphp/nginx/PHP-56.sh
@@ -11,7 +11,7 @@ pool_conf="[$2]
 listen = /run/php/php5.6-fpm-$2.sock
 listen.owner = $1
 listen.group = $1
-listen.mode = 0666
+listen.mode = 0660
 
 user = $1
 group = $1
diff --git a/install/deb/multiphp/nginx/PHP-70.sh b/install/deb/multiphp/nginx/PHP-70.sh
@@ -11,7 +11,7 @@ pool_conf="[$2]
 listen = /run/php/php7.0-fpm-$2.sock
 listen.owner = $1
 listen.group = $1
-listen.mode = 0666
+listen.mode = 0660
 
 user = $1
 group = $1
diff --git a/install/deb/multiphp/nginx/PHP-71.sh b/install/deb/multiphp/nginx/PHP-71.sh
@@ -11,7 +11,7 @@ pool_conf="[$2]
 listen = /run/php/php7.1-fpm-$2.sock
 listen.owner = $1
 listen.group = $1
-listen.mode = 0666
+listen.mode = 0660
 
 user = $1
 group = $1
diff --git a/install/deb/multiphp/nginx/PHP-72.sh b/install/deb/multiphp/nginx/PHP-72.sh
@@ -11,7 +11,7 @@ pool_conf="[$2]
 listen = /run/php/php7.2-fpm-$2.sock
 listen.owner = $1
 listen.group = $1
-listen.mode = 0666
+listen.mode = 0660
 
 user = $1
 group = $1
diff --git a/install/deb/multiphp/nginx/PHP-73.sh b/install/deb/multiphp/nginx/PHP-73.sh
@@ -11,7 +11,7 @@ pool_conf="[$2]
 listen = /run/php/php7.3-fpm-$2.sock
 listen.owner = $1
 listen.group = $1
-listen.mode = 0666
+listen.mode = 0660
 
 user = $1
 group = $1
diff --git a/install/hst-install-debian.sh b/install/hst-install-debian.sh
@@ -26,20 +26,7 @@ pma_v='4.8.5'
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3")
 fpm_v="7.3"
 
-if [ "$release" -eq 9 ]; then
-    software="nginx apache2 apache2-utils apache2-suexec-custom
-        libapache2-mod-ruid2 libapache2-mod-fcgid libapache2-mod-php php
-        php-common php-cgi php-mysql php-curl php-pgsql php-imap php-ldap php-apcu
-        awstats vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy 
-        clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core net-tools
-        roundcube-mysql roundcube-plugins mariadb-client mariadb-common
-        mariadb-server postgresql postgresql-contrib phppgadmin phpmyadmin mc
-        flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
-        e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
-        bsdmainutils cron hestia hestia-nginx hestia-php expect libmail-dkim-perl
-        unrar-free vim-common z-push-common z-push-backend-imap z-push-backend-combined
-        z-push-autodiscover"
-else
+if [ "$release" -eq 8 ]; then
     software="nginx apache2 apache2-utils apache2.2-common
         apache2-suexec-custom libapache2-mod-ruid2
         libapache2-mod-fcgid libapache2-mod-php5 php5 php5-common php5-cgi
@@ -53,6 +40,19 @@ else
         bsdmainutils cron hestia hestia-nginx hestia-php expect libmail-dkim-perl
         unrar-free vim-common z-push-common z-push-backend-imap z-push-backend-combined
         z-push-autodiscover"
+else
+    software="nginx apache2 apache2-utils apache2-suexec-custom
+        libapache2-mod-ruid2 libapache2-mod-fcgid libapache2-mod-php php
+        php-common php-cgi php-mysql php-curl php-pgsql php-imap php-ldap php-apcu
+        awstats vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy 
+        clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core net-tools
+        roundcube-mysql roundcube-plugins mariadb-client mariadb-common
+        mariadb-server postgresql postgresql-contrib phppgadmin phpmyadmin mc
+        flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
+        e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
+        bsdmainutils cron hestia hestia-nginx hestia-php expect libmail-dkim-perl
+        unrar-free vim-common z-push-common z-push-backend-imap z-push-backend-combined
+        z-push-autodiscover"
 fi
 
 # Defining help function
@@ -593,17 +593,22 @@ fi
 # Installing MariaDB repo
 echo "(*) MariaDB"
 echo "deb [arch=amd64] http://ams2.mirrors.digitalocean.com/mariadb/repo/10.3/$VERSION $codename main" > $apt/mariadb.list
-if [ "$release" -eq 9 ]; then
-    APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --recv-keys --keyserver keyserver.ubuntu.com F1656F24C74CD1D8 > /dev/null 2>&1
-else
+if [ "$release" -eq 8 ]; then
     APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --recv-keys --keyserver keyserver.ubuntu.com CBCB082A1BB943DB > /dev/null 2>&1
+else
+    APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --recv-keys --keyserver keyserver.ubuntu.com F1656F24C74CD1D8 > /dev/null 2>&1
 fi
 
 # Installing Backport repo for debian 8
 if [ "$release" -eq 8 ]; then
     echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list
 fi
 
+# Installing Backport repo for debian 10
+if [ "$release" -eq 10 ]; then
+    echo "deb http://ftp.debian.org/debian stretch-backports main" >> /etc/apt/sources.list
+fi
+
 # Installing hestia repo
 echo "(*) Hestia Control Panel"
 echo "deb https://$RHOST/ $codename main" > $apt/hestia.list
