Merge 0.10.0 prerelease branch.

Author: ScIT-Raphael

bin/v-rebuild-web-domains

@@ -39,7 +39,7 @@ is_object_unsuspended 'user' 'USER' "$user"
 # Deleting old web configs
 sed -i "/.*\/$user\/conf\/web\//d" /etc/$WEB_SYSTEM/conf.d/hestia.conf
 
-if [ -e "$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf"  ]; then
+if [ -e "$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf" ]; then
     rm -f $HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf
     rm -f /etc/$WEB_SYSTEM/conf.d/domains/$domain.conf
 fi

install/deb/php-fpm/dummy.conf

@@ -6,6 +6,6 @@ user = www-data
 group = www-data
 
 pm = ondemand
-pm.max_children = 2
+pm.max_children = 4
 pm.max_requests = 4000
-pm.process_idle_timeout = 10s
+pm.process_idle_timeout = 10s

install/deb/php-fpm/www.conf

@@ -6,6 +6,6 @@ user = www-data
 group = www-data
 
 pm = ondemand
-pm.max_children = 2
+pm.max_children = 4
 pm.max_requests = 4000
-pm.process_idle_timeout = 10s
+pm.process_idle_timeout = 10s

install/deb/templates/web/nginx/php-fpm/wordpress.stpl

@@ -67,5 +67,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
-}
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
+}

install/deb/templates/web/nginx/php-fpm/wordpress.tpl

@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
-}
+    include     %home%/%user%/conf/web/%domain%/nginx.conf_*;
+}

install/upgrade/0.10.0-190430.sh

@@ -265,7 +265,7 @@ $BIN/v-restart-dns $restart
 
 echo ""
 echo "    Upgrade complete! Please report any bugs or issues to"
-echo "    https://github.com/hestiacp/hestiacp/issues."
+echo "    https://github.com/hestiacp/hestiacp/issues"
 echo ""
 echo "    We hope that you enjoy this release of Hestia Control Panel,"
 echo "    enjoy your day!"