Browse Source

Install php version according to fpm_v for deb10, use mpm_itk instead...
... of ruid2 for deb10, commit fixes #615. Special thanks to @FalzoMAD!

Raphael Schneeberger 6 years ago
parent
commit
1e2b5fdf37
1 changed files with 18 additions and 10 deletions
  1. 18 10
      install/hst-install-debian.sh

+ 18 - 10
install/hst-install-debian.sh

@@ -57,16 +57,20 @@ elif [ "$release" -eq 9 ]; then
         unrar-free vim-common acl sysstat rsyslog setpriv"
         unrar-free vim-common acl sysstat rsyslog setpriv"
 elif [ "$release" -eq 10 ]; then
 elif [ "$release" -eq 10 ]; then
     software="nginx apache2 apache2-utils apache2-suexec-custom
     software="nginx apache2 apache2-utils apache2-suexec-custom
-        apache2-suexec-pristine libapache2-mod-fcgid libapache2-mod-php php
-        php-common php-cgi php-mysql php-curl php-pgsql php-imap php-ldap php-apcu
-        php-imagick 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
+        apache2-suexec-pristine libapache2-mod-fcgid libapache2-mpm-itk 
+        libapache2-mod-php$fpm_v php$fpm_v php$fpm_v-common php$fpm_v-cgi
+        php$fpm_v-mysql php$fpm_v-curl php$fpm_v-pgsql php$fpm_v-imagick 
+        php$fpm_v-imap php$fpm_v-ldap php$fpm_v-apcu awstats php$fpm_v-zip
+        php$fpm_v-bz2 php$fpm_v-cli php$fpm_v-gd php$fpm_v-intl php$fpm_v-json
+        php$fpm_v-mbstring php$fpm_v-opcache php$fpm_v-pspell php$fpm_v-readline
+        php$fpm_v-xml 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 phpmyadmin phppgadmin mc
         mariadb-server postgresql postgresql-contrib phpmyadmin phppgadmin mc
-        flex whois 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 acl sysstat rsyslog util-linux"
+        flex whois 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 acl sysstat rsyslog util-linux"
 fi
 fi
 
 
 # Defining help function
 # Defining help function
@@ -1153,7 +1157,11 @@ if [ "$apache" = 'yes' ]; then
     a2enmod suexec > /dev/null 2>&1
     a2enmod suexec > /dev/null 2>&1
     a2enmod ssl > /dev/null 2>&1
     a2enmod ssl > /dev/null 2>&1
     a2enmod actions > /dev/null 2>&1
     a2enmod actions > /dev/null 2>&1
-    a2enmod ruid2 > /dev/null 2>&1
+    if [ "$release" -eq 10 ]; then
+        a2enmod mpm_itk > /dev/null 2>&1
+    else
+        a2enmod ruid2 > /dev/null 2>&1
+    fi
     mkdir -p /etc/apache2/conf.d
     mkdir -p /etc/apache2/conf.d
     mkdir -p /etc/apache2/conf.d/domains
     mkdir -p /etc/apache2/conf.d/domains
     echo "# Powered by hestia" > /etc/apache2/sites-available/default
     echo "# Powered by hestia" > /etc/apache2/sites-available/default