Revert PHP FPM changes to default.

install/debian/8/php-fpm/default.sh

@@ -1,49 +0,0 @@
-#!/bin/bash
-# Adding php pool conf
-user="$1"
-domain="$2"
-ip="$3"
-home_dir="$4"
-docroot="$5"
-
-pool_conf="[$2]
-
-listen = /run/php/php7.2-fpm-$2.sock
-listen.owner = $1
-listen.group = $1
-listen.mode = 0666
-
-user = $1
-group = $1
-
-pm = ondemand
-pm.max_children = 4
-pm.max_requests = 4000
-pm.process_idle_timeout = 10s
-pm.status_path = /status
-
-php_admin_value[upload_tmp_dir] = /home/$1/tmp
-php_admin_value[session.save_path] = /home/$1/tmp
-php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail
-php_admin_value[upload_max_filesize] = 80M
-php_admin_value[max_execution_time] = 20
-php_admin_value[post_max_size] = 80M
-php_admin_value[memory_limit] = 256M
-php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\"
-php_admin_flag[mysql.allow_persistent] = off
-php_admin_flag[safe_mode] = off
-
-env[PATH] = /usr/local/bin:/usr/bin:/bin
-env[TMP] = /home/$1/tmp
-env[TMPDIR] = /home/$1/tmp
-env[TEMP] = /home/$1/tmp
-"
-
-pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf"
-
-if [ ! -f "$pool_file_72" ]; then
-    echo "$pool_conf" > $pool_file_72
-    service php7.2-fpm restart
-fi
-
-exit 0

install/debian/8/php-fpm/default.stpl

@@ -1,55 +0,0 @@
-server {
-    listen      %ip%:%web_ssl_port%;
-    server_name %domain_idn% %alias_idn%;
-    root        %sdocroot%;
-    index       index.php index.html index.htm;
-    access_log  /var/log/nginx/domains/%domain%.log combined;
-    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
-    error_log   /var/log/nginx/domains/%domain%.error.log error;
-
-    ssl         on;
-    ssl_certificate      %ssl_pem%;
-    ssl_certificate_key  %ssl_key%;
-
-    location / {
-
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
-            expires     max;
-        }
-
-        location ~ [^/]\.php(/|$) {
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            if (!-f $document_root$fastcgi_script_name) {
-                return  404;
-            }
-
-            fastcgi_pass    unix:/run/php/php7.2-fpm-%domain%.sock;
-            fastcgi_index   index.php;
-            include         /etc/nginx/fastcgi_params;
-        }
-    }
-
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
-    location /error/ {
-        alias   %home%/%user%/web/%domain%/document_errors/;
-    }
-
-    location ~* "/\.(htaccess|htpasswd)$" {
-        deny    all;
-        return  404;
-    }
-
-    location /vstats/ {
-        alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
-    }
-
-    include     /etc/nginx/conf.d/phpmyadmin.inc*;
-    include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
-}

install/debian/8/php-fpm/default.tpl

@@ -1,51 +0,0 @@
-server {
-    listen      %ip%:%web_port%;
-    server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
-    index       index.php index.html index.htm;
-    access_log  /var/log/nginx/domains/%domain%.log combined;
-    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
-    error_log   /var/log/nginx/domains/%domain%.error.log error;
-
-    location / {
-
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
-            expires     max;
-        }
-
-        location ~ [^/]\.php(/|$) {
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            if (!-f $document_root$fastcgi_script_name) {
-                return  404;
-            }
-
-            fastcgi_pass    unix:/run/php/php7.2-fpm-%domain%.sock;
-            fastcgi_index   index.php;
-            include         /etc/nginx/fastcgi_params;
-        }
-    }
-
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
-    location /error/ {
-        alias   %home%/%user%/web/%domain%/document_errors/;
-    }
-
-    location ~* "/\.(htaccess|htpasswd)$" {
-        deny    all;
-        return  404;
-    }
-
-    location /vstats/ {
-        alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
-    }
-
-    include     /etc/nginx/conf.d/phpmyadmin.inc*;
-    include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
-}

install/debian/8/php5-fpm/www.conf

@@ -0,0 +1,11 @@
+[www]
+listen = 127.0.0.1:9000
+listen.allowed_clients = 127.0.0.1
+
+user = www-data
+group = www-data
+
+pm = ondemand
+pm.max_children = 2
+pm.max_requests = 4000
+pm.process_idle_timeout = 10s

install/debian/9/php-fpm/default.sh

@@ -1,49 +0,0 @@
-#!/bin/bash
-# Adding php pool conf
-user="$1"
-domain="$2"
-ip="$3"
-home_dir="$4"
-docroot="$5"
-
-pool_conf="[$2]
-
-listen = /run/php/php7.2-fpm-$2.sock
-listen.owner = $1
-listen.group = $1
-listen.mode = 0666
-
-user = $1
-group = $1
-
-pm = ondemand
-pm.max_children = 4
-pm.max_requests = 4000
-pm.process_idle_timeout = 10s
-pm.status_path = /status
-
-php_admin_value[upload_tmp_dir] = /home/$1/tmp
-php_admin_value[session.save_path] = /home/$1/tmp
-php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail
-php_admin_value[upload_max_filesize] = 80M
-php_admin_value[max_execution_time] = 20
-php_admin_value[post_max_size] = 80M
-php_admin_value[memory_limit] = 256M
-php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\"
-php_admin_flag[mysql.allow_persistent] = off
-php_admin_flag[safe_mode] = off
-
-env[PATH] = /usr/local/bin:/usr/bin:/bin
-env[TMP] = /home/$1/tmp
-env[TMPDIR] = /home/$1/tmp
-env[TEMP] = /home/$1/tmp
-"
-
-pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf"
-
-if [ ! -f "$pool_file_72" ]; then
-    echo "$pool_conf" > $pool_file_72
-    service php7.2-fpm restart
-fi
-
-exit 0

install/debian/9/php-fpm/default.stpl

@@ -1,55 +0,0 @@
-server {
-    listen      %ip%:%web_ssl_port%;
-    server_name %domain_idn% %alias_idn%;
-    root        %sdocroot%;
-    index       index.php index.html index.htm;
-    access_log  /var/log/nginx/domains/%domain%.log combined;
-    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
-    error_log   /var/log/nginx/domains/%domain%.error.log error;
-
-    ssl         on;
-    ssl_certificate      %ssl_pem%;
-    ssl_certificate_key  %ssl_key%;
-
-    location / {
-
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
-            expires     max;
-        }
-
-        location ~ [^/]\.php(/|$) {
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            if (!-f $document_root$fastcgi_script_name) {
-                return  404;
-            }
-
-            fastcgi_pass    unix:/run/php/php7.2-fpm-%domain%.sock;
-            fastcgi_index   index.php;
-            include         /etc/nginx/fastcgi_params;
-        }
-    }
-
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
-    location /error/ {
-        alias   %home%/%user%/web/%domain%/document_errors/;
-    }
-
-    location ~* "/\.(htaccess|htpasswd)$" {
-        deny    all;
-        return  404;
-    }
-
-    location /vstats/ {
-        alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
-    }
-
-    include     /etc/nginx/conf.d/phpmyadmin.inc*;
-    include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
-}

install/debian/9/php-fpm/default.tpl

@@ -1,51 +0,0 @@
-server {
-    listen      %ip%:%web_port%;
-    server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
-    index       index.php index.html index.htm;
-    access_log  /var/log/nginx/domains/%domain%.log combined;
-    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
-    error_log   /var/log/nginx/domains/%domain%.error.log error;
-
-    location / {
-
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
-            expires     max;
-        }
-
-        location ~ [^/]\.php(/|$) {
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            if (!-f $document_root$fastcgi_script_name) {
-                return  404;
-            }
-
-            fastcgi_pass    unix:/run/php/php7.2-fpm-%domain%.sock;
-            fastcgi_index   index.php;
-            include         /etc/nginx/fastcgi_params;
-        }
-    }
-
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
-    location /error/ {
-        alias   %home%/%user%/web/%domain%/document_errors/;
-    }
-
-    location ~* "/\.(htaccess|htpasswd)$" {
-        deny    all;
-        return  404;
-    }
-
-    location /vstats/ {
-        alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
-    }
-
-    include     /etc/nginx/conf.d/phpmyadmin.inc*;
-    include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
-}

install/debian/9/php-fpm/www.conf

@@ -0,0 +1,11 @@
+[www]
+listen = 127.0.0.1:9000
+listen.allowed_clients = 127.0.0.1
+
+user = www-data
+group = www-data
+
+pm = ondemand
+pm.max_children = 2
+pm.max_requests = 4000
+pm.process_idle_timeout = 10s

install/hst-install-debian.sh

@@ -21,7 +21,7 @@ hestiacp="$HESTIA/install/$VERSION/$release"
 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 awstats
+        php-common php-cgi php-mysql php-curl php-fpm php-pgsql awstats
         webalizer vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy
         clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core
         roundcube-mysql roundcube-plugins mysql-server mysql-common
@@ -34,7 +34,7 @@ elif [ "$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
-        php5-mysql php5-curl php5-pgsql awstats webalizer vsftpd
+        php5-mysql php5-curl php5-fpm php5-pgsql awstats webalizer vsftpd
         proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon
         spamassassin dovecot-imapd dovecot-pop3d roundcube-core
         roundcube-mysql roundcube-plugins mysql-server mysql-common
@@ -47,7 +47,7 @@ else
     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
-        php5-mysql php5-curl php5-pgsql awstats webalizer vsftpd
+        php5-mysql php5-curl php5-fpm php5-pgsql awstats webalizer vsftpd
         proftpd-basic proftpd-mod-vroot bind9 exim4 exim4-daemon-heavy
         clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core
         roundcube-mysql roundcube-plugins mysql-server mysql-common
@@ -587,6 +587,10 @@ if [ "$apache" = 'no' ]; then
     software=$(echo "$software" | sed -e "s/libapache2-mod-php5//")
     software=$(echo "$software" | sed -e "s/libapache2-mod-php//")
 fi
+if [ "$phpfpm" = 'no' ]; then
+    software=$(echo "$software" | sed -e "s/php5-fpm//")
+    software=$(echo "$software" | sed -e "s/php-fpm//")
+fi
 if [ "$vsftpd" = 'no' ]; then
     software=$(echo "$software" | sed -e "s/vsftpd//")
 fi
@@ -787,8 +791,14 @@ if [ "$apache" = 'no' ] && [ "$nginx"  = 'yes' ]; then
     echo "WEB_PORT='80'" >> $HESTIA/conf/hestia.conf
     echo "WEB_SSL_PORT='443'" >> $HESTIA/conf/hestia.conf
     echo "WEB_SSL='openssl'"  >> $HESTIA/conf/hestia.conf
-    if [ "$phpfpm" = 'yes' ]; then
-        echo "WEB_BACKEND='php-fpm'" >> $HESTIA/conf/hestia.conf
+    if [ "$release" -eq 9 ]; then
+        if [ "$phpfpm" = 'yes' ]; then
+            echo "WEB_BACKEND='php-fpm'" >> $HESTIA/conf/hestia.conf
+        fi
+    else
+        if [ "$phpfpm" = 'yes' ]; then
+            echo "WEB_BACKEND='php5-fpm'" >> $HESTIA/conf/hestia.conf
+        fi
     fi
     echo "STATS_SYSTEM='webalizer,awstats'" >> $HESTIA/conf/hestia.conf
 fi
@@ -983,11 +993,17 @@ fi
 #----------------------------------------------------------#
 
 if [ "$phpfpm" = 'yes' ]; then
-    cp -r /etc/php/7.2/ /root/hst_install_backups/php7.2/
-    rm -f /etc/php/7.2/fpm/pool.d/*
-    cp -f $hestiacp/php-fpm/* $HESTIA/data/templates/web/nginx/
-    chmod a+x $HESTIA/data/templates/web/nginx/*.sh
-    update-rc.d php7.2-fpm defaults
+     if [ "$release" -eq 9 ]; then
+        cp -f $hestiacp/php-fpm/www.conf /etc/php/7.0/fpm/pool.d/www.conf
+        update-rc.d php7.0-fpm defaults
+        service php7.0-fpm start
+        check_result $? "php-fpm start failed"
+    else
+        cp -f $hestiacp/php5-fpm/www.conf /etc/php5/fpm/pool.d/www.conf
+        update-rc.d php5-fpm defaults
+        service php5-fpm start
+        check_result $? "php-fpm start failed"
+    fi
 fi
 
 

install/hst-install-ubuntu.sh

@@ -25,7 +25,7 @@ software="apache2 apache2.2-common apache2-suexec-custom apache2-utils
     exim4-daemon-heavy expect fail2ban flex ftp git idn imagemagick
     libapache2-mod-fcgid libapache2-mod-php libapache2-mod-rpaf
     libapache2-mod-ruid2 lsof mc mysql-client mysql-common mysql-server nginx
-    ntpdate php-cgi php-common php-curl phpmyadmin php-mysql
+    ntpdate php-cgi php-common php-curl php-fpm phpmyadmin php-mysql
     phppgadmin php-pgsql postgresql postgresql-contrib proftpd-basic quota
     roundcube-core roundcube-mysql roundcube-plugins rrdtool rssh spamassassin
     sudo hestia hestia-nginx hestia-php vim-common vsftpd webalizer whois zip"
@@ -583,6 +583,11 @@ if [ "$apache" = 'no' ]; then
     software=$(echo "$software" | sed -e "s/libapache2-mod-php5//")
     software=$(echo "$software" | sed -e "s/libapache2-mod-php//")
 fi
+if [ "$phpfpm" = 'no' ]; then
+    software=$(echo "$software" | sed -e "s/php7.0-fpm//")
+    software=$(echo "$software" | sed -e "s/php5-fpm//")
+    software=$(echo "$software" | sed -e "s/php-fpm//")
+fi
 if [ "$vsftpd" = 'no' ]; then
     software=$(echo "$software" | sed -e "s/vsftpd//")
 fi
@@ -654,13 +659,6 @@ if [ "$multiphp" = 'yes' ]; then
     software="$software $mph"
 fi
 
-if [ "$phpfpm" = 'yes' ]; then
-    fpm="php7.2-apcu php7.2-mbstring php7.2-bcmath php7.2-cli php7.2-curl
-         php7.2-fpm php7.2-gd php7.2-intl php7.2-mysql php7.2-soap
-         php7.2-xml php7.2-zip php7.2-memcache php7.2-memcached php7.2-zip"
-    software="$software $fpm"
-fi
-
 #----------------------------------------------------------#
 #                     Install packages                     #
 #----------------------------------------------------------#
@@ -984,11 +982,13 @@ fi
 #----------------------------------------------------------#
 
 if [ "$phpfpm" = 'yes' ]; then
-    cp -r /etc/php/7.2/ /root/hst_install_backups/php7.2/
-    rm -f /etc/php/7.2/fpm/pool.d/*
-    cp -f $hestiacp/php-fpm/* $HESTIA/data/templates/web/nginx/
-    chmod a+x $HESTIA/data/templates/web/nginx/*.sh
-    update-rc.d php7.2-fpm defaults
+    pool=$(find /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \))
+    cp -f $hestiacp/php-fpm/www.conf $pool/
+    php_fpm=$(ls /etc/init.d/php*-fpm* |cut -f 4 -d /)
+    ln -s /etc/init.d/$php_fpm /etc/init.d/php-fpm > /dev/null 2>&1
+    update-rc.d $php_fpm defaults
+    service $php_fpm start
+    check_result $? "php-fpm start failed"
 fi
 
 

install/ubuntu/14.04/php-fpm/default.sh

@@ -1,49 +0,0 @@
-#!/bin/bash
-# Adding php pool conf
-user="$1"
-domain="$2"
-ip="$3"
-home_dir="$4"
-docroot="$5"
-
-pool_conf="[$2]
-
-listen = /run/php/php7.2-fpm-$2.sock
-listen.owner = $1
-listen.group = $1
-listen.mode = 0666
-
-user = $1
-group = $1
-
-pm = ondemand
-pm.max_children = 4
-pm.max_requests = 4000
-pm.process_idle_timeout = 10s
-pm.status_path = /status
-
-php_admin_value[upload_tmp_dir] = /home/$1/tmp
-php_admin_value[session.save_path] = /home/$1/tmp
-php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail
-php_admin_value[upload_max_filesize] = 80M
-php_admin_value[max_execution_time] = 20
-php_admin_value[post_max_size] = 80M
-php_admin_value[memory_limit] = 256M
-php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\"
-php_admin_flag[mysql.allow_persistent] = off
-php_admin_flag[safe_mode] = off
-
-env[PATH] = /usr/local/bin:/usr/bin:/bin
-env[TMP] = /home/$1/tmp
-env[TMPDIR] = /home/$1/tmp
-env[TEMP] = /home/$1/tmp
-"
-
-pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf"
-
-if [ ! -f "$pool_file_72" ]; then
-    echo "$pool_conf" > $pool_file_72
-    service php7.2-fpm restart
-fi
-
-exit 0

install/ubuntu/14.04/php-fpm/default.stpl

@@ -1,55 +0,0 @@
-server {
-    listen      %ip%:%web_ssl_port%;
-    server_name %domain_idn% %alias_idn%;
-    root        %sdocroot%;
-    index       index.php index.html index.htm;
-    access_log  /var/log/nginx/domains/%domain%.log combined;
-    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
-    error_log   /var/log/nginx/domains/%domain%.error.log error;
-
-    ssl         on;
-    ssl_certificate      %ssl_pem%;
-    ssl_certificate_key  %ssl_key%;
-
-    location / {
-
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
-            expires     max;
-        }
-
-        location ~ [^/]\.php(/|$) {
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            if (!-f $document_root$fastcgi_script_name) {
-                return  404;
-            }
-
-            fastcgi_pass    unix:/run/php/php7.2-fpm-%domain%.sock;
-            fastcgi_index   index.php;
-            include         /etc/nginx/fastcgi_params;
-        }
-    }
-
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
-    location /error/ {
-        alias   %home%/%user%/web/%domain%/document_errors/;
-    }
-
-    location ~* "/\.(htaccess|htpasswd)$" {
-        deny    all;
-        return  404;
-    }
-
-    location /vstats/ {
-        alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
-    }
-
-    include     /etc/nginx/conf.d/phpmyadmin.inc*;
-    include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
-}

install/ubuntu/14.04/php-fpm/default.tpl

@@ -1,51 +0,0 @@
-server {
-    listen      %ip%:%web_port%;
-    server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
-    index       index.php index.html index.htm;
-    access_log  /var/log/nginx/domains/%domain%.log combined;
-    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
-    error_log   /var/log/nginx/domains/%domain%.error.log error;
-
-    location / {
-
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
-            expires     max;
-        }
-
-        location ~ [^/]\.php(/|$) {
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            if (!-f $document_root$fastcgi_script_name) {
-                return  404;
-            }
-
-            fastcgi_pass    unix:/run/php/php7.2-fpm-%domain%.sock;
-            fastcgi_index   index.php;
-            include         /etc/nginx/fastcgi_params;
-        }
-    }
-
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
-    location /error/ {
-        alias   %home%/%user%/web/%domain%/document_errors/;
-    }
-
-    location ~* "/\.(htaccess|htpasswd)$" {
-        deny    all;
-        return  404;
-    }
-
-    location /vstats/ {
-        alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
-    }
-
-    include     /etc/nginx/conf.d/phpmyadmin.inc*;
-    include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
-}

install/ubuntu/14.04/php-fpm/www.conf

@@ -0,0 +1,11 @@
+[www]
+listen = 127.0.0.1:9000
+listen.allowed_clients = 127.0.0.1
+
+user = www-data
+group = www-data
+
+pm = ondemand
+pm.max_children = 2
+pm.max_requests = 4000
+pm.process_idle_timeout = 10s

install/ubuntu/16.04/php-fpm/default.sh

@@ -1,49 +0,0 @@
-#!/bin/bash
-# Adding php pool conf
-user="$1"
-domain="$2"
-ip="$3"
-home_dir="$4"
-docroot="$5"
-
-pool_conf="[$2]
-
-listen = /run/php/php7.2-fpm-$2.sock
-listen.owner = $1
-listen.group = $1
-listen.mode = 0666
-
-user = $1
-group = $1
-
-pm = ondemand
-pm.max_children = 4
-pm.max_requests = 4000
-pm.process_idle_timeout = 10s
-pm.status_path = /status
-
-php_admin_value[upload_tmp_dir] = /home/$1/tmp
-php_admin_value[session.save_path] = /home/$1/tmp
-php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail
-php_admin_value[upload_max_filesize] = 80M
-php_admin_value[max_execution_time] = 20
-php_admin_value[post_max_size] = 80M
-php_admin_value[memory_limit] = 256M
-php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\"
-php_admin_flag[mysql.allow_persistent] = off
-php_admin_flag[safe_mode] = off
-
-env[PATH] = /usr/local/bin:/usr/bin:/bin
-env[TMP] = /home/$1/tmp
-env[TMPDIR] = /home/$1/tmp
-env[TEMP] = /home/$1/tmp
-"
-
-pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf"
-
-if [ ! -f "$pool_file_72" ]; then
-    echo "$pool_conf" > $pool_file_72
-    service php7.2-fpm restart
-fi
-
-exit 0

install/ubuntu/16.04/php-fpm/default.stpl

@@ -1,55 +0,0 @@
-server {
-    listen      %ip%:%web_ssl_port%;
-    server_name %domain_idn% %alias_idn%;
-    root        %sdocroot%;
-    index       index.php index.html index.htm;
-    access_log  /var/log/nginx/domains/%domain%.log combined;
-    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
-    error_log   /var/log/nginx/domains/%domain%.error.log error;
-
-    ssl         on;
-    ssl_certificate      %ssl_pem%;
-    ssl_certificate_key  %ssl_key%;
-
-    location / {
-
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
-            expires     max;
-        }
-
-        location ~ [^/]\.php(/|$) {
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            if (!-f $document_root$fastcgi_script_name) {
-                return  404;
-            }
-
-            fastcgi_pass    unix:/run/php/php7.2-fpm-%domain%.sock;
-            fastcgi_index   index.php;
-            include         /etc/nginx/fastcgi_params;
-        }
-    }
-
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
-    location /error/ {
-        alias   %home%/%user%/web/%domain%/document_errors/;
-    }
-
-    location ~* "/\.(htaccess|htpasswd)$" {
-        deny    all;
-        return  404;
-    }
-
-    location /vstats/ {
-        alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
-    }
-
-    include     /etc/nginx/conf.d/phpmyadmin.inc*;
-    include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
-}

install/ubuntu/16.04/php-fpm/default.tpl

@@ -1,51 +0,0 @@
-server {
-    listen      %ip%:%web_port%;
-    server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
-    index       index.php index.html index.htm;
-    access_log  /var/log/nginx/domains/%domain%.log combined;
-    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
-    error_log   /var/log/nginx/domains/%domain%.error.log error;
-
-    location / {
-
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
-            expires     max;
-        }
-
-        location ~ [^/]\.php(/|$) {
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            if (!-f $document_root$fastcgi_script_name) {
-                return  404;
-            }
-
-            fastcgi_pass    unix:/run/php/php7.2-fpm-%domain%.sock;
-            fastcgi_index   index.php;
-            include         /etc/nginx/fastcgi_params;
-        }
-    }
-
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
-    location /error/ {
-        alias   %home%/%user%/web/%domain%/document_errors/;
-    }
-
-    location ~* "/\.(htaccess|htpasswd)$" {
-        deny    all;
-        return  404;
-    }
-
-    location /vstats/ {
-        alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
-    }
-
-    include     /etc/nginx/conf.d/phpmyadmin.inc*;
-    include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
-}

install/ubuntu/16.04/php-fpm/www.conf

@@ -0,0 +1,11 @@
+[www]
+listen = 127.0.0.1:9000
+listen.allowed_clients = 127.0.0.1
+
+user = www-data
+group = www-data
+
+pm = ondemand
+pm.max_children = 2
+pm.max_requests = 4000
+pm.process_idle_timeout = 10s

install/ubuntu/18.04/php-fpm/default.sh

@@ -1,49 +0,0 @@
-#!/bin/bash
-# Adding php pool conf
-user="$1"
-domain="$2"
-ip="$3"
-home_dir="$4"
-docroot="$5"
-
-pool_conf="[$2]
-
-listen = /run/php/php7.2-fpm-$2.sock
-listen.owner = $1
-listen.group = $1
-listen.mode = 0666
-
-user = $1
-group = $1
-
-pm = ondemand
-pm.max_children = 4
-pm.max_requests = 4000
-pm.process_idle_timeout = 10s
-pm.status_path = /status
-
-php_admin_value[upload_tmp_dir] = /home/$1/tmp
-php_admin_value[session.save_path] = /home/$1/tmp
-php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail
-php_admin_value[upload_max_filesize] = 80M
-php_admin_value[max_execution_time] = 20
-php_admin_value[post_max_size] = 80M
-php_admin_value[memory_limit] = 256M
-php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\"
-php_admin_flag[mysql.allow_persistent] = off
-php_admin_flag[safe_mode] = off
-
-env[PATH] = /usr/local/bin:/usr/bin:/bin
-env[TMP] = /home/$1/tmp
-env[TMPDIR] = /home/$1/tmp
-env[TEMP] = /home/$1/tmp
-"
-
-pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf"
-
-if [ ! -f "$pool_file_72" ]; then
-    echo "$pool_conf" > $pool_file_72
-    service php7.2-fpm restart
-fi
-
-exit 0

install/ubuntu/18.04/php-fpm/default.stpl

@@ -1,55 +0,0 @@
-server {
-    listen      %ip%:%web_ssl_port%;
-    server_name %domain_idn% %alias_idn%;
-    root        %sdocroot%;
-    index       index.php index.html index.htm;
-    access_log  /var/log/nginx/domains/%domain%.log combined;
-    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
-    error_log   /var/log/nginx/domains/%domain%.error.log error;
-
-    ssl         on;
-    ssl_certificate      %ssl_pem%;
-    ssl_certificate_key  %ssl_key%;
-
-    location / {
-
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
-            expires     max;
-        }
-
-        location ~ [^/]\.php(/|$) {
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            if (!-f $document_root$fastcgi_script_name) {
-                return  404;
-            }
-
-            fastcgi_pass    unix:/run/php/php7.2-fpm-%domain%.sock;
-            fastcgi_index   index.php;
-            include         /etc/nginx/fastcgi_params;
-        }
-    }
-
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
-    location /error/ {
-        alias   %home%/%user%/web/%domain%/document_errors/;
-    }
-
-    location ~* "/\.(htaccess|htpasswd)$" {
-        deny    all;
-        return  404;
-    }
-
-    location /vstats/ {
-        alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
-    }
-
-    include     /etc/nginx/conf.d/phpmyadmin.inc*;
-    include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
-}

install/ubuntu/18.04/php-fpm/default.tpl

@@ -1,51 +0,0 @@
-server {
-    listen      %ip%:%web_port%;
-    server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
-    index       index.php index.html index.htm;
-    access_log  /var/log/nginx/domains/%domain%.log combined;
-    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
-    error_log   /var/log/nginx/domains/%domain%.error.log error;
-
-    location / {
-
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
-            expires     max;
-        }
-
-        location ~ [^/]\.php(/|$) {
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            if (!-f $document_root$fastcgi_script_name) {
-                return  404;
-            }
-
-            fastcgi_pass    unix:/run/php/php7.2-fpm-%domain%.sock;
-            fastcgi_index   index.php;
-            include         /etc/nginx/fastcgi_params;
-        }
-    }
-
-    error_page  403 /error/404.html;
-    error_page  404 /error/404.html;
-    error_page  500 502 503 504 /error/50x.html;
-
-    location /error/ {
-        alias   %home%/%user%/web/%domain%/document_errors/;
-    }
-
-    location ~* "/\.(htaccess|htpasswd)$" {
-        deny    all;
-        return  404;
-    }
-
-    location /vstats/ {
-        alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
-    }
-
-    include     /etc/nginx/conf.d/phpmyadmin.inc*;
-    include     /etc/nginx/conf.d/phppgadmin.inc*;
-    include     /etc/nginx/conf.d/webmail.inc*;
-
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
-}

install/ubuntu/18.04/php-fpm/www.conf

@@ -0,0 +1,11 @@
+[www]
+listen = 127.0.0.1:9000
+listen.allowed_clients = 127.0.0.1
+
+user = www-data
+group = www-data
+
+pm = ondemand
+pm.max_children = 2
+pm.max_requests = 4000
+pm.process_idle_timeout = 10s