Fix/2021 03 install issues (#1656)

* Fix issue with activating nginx cache due to non existing optional config file

* Issue in createing folder phpmyadmin

* - Unable to chmod an folder / Double create folder Ubuntu
- Didn’t install roundcube + Didn’t set webmail_alias

* Drop 16.04 from installers / build script

* Add if exits to DROP DATABASE and  DROP USER

* Disable ssl_reject_handshake on; in hestia-nginx config 
#1653

* Delete files recursive

* Remove double space

* Use shorten form for -r -f

Co-authored-by: Raphael Schneeberger <rs@scit.ch>

bin/v-add-sys-roundcube

@@ -121,9 +121,8 @@ if [ "$UPDATE" == "no" ]; then
     chmod 751 $RC_LOG
     
     if [ ! -z "$(echo "$DB_SYSTEM" | grep -w 'mysql')" ]; then
-        # Remove the following 2 lines when going live
-        mysql -e "DROP DATABASE roundcube"
-        mysql -e "DROP USER roundcube@localhost"
+        mysql -e "DROP DATABASE IF EXISTS roundcube"
+        mysql -e "DROP USER IF EXISTS roundcube@localhost"
         mysql -e "CREATE DATABASE roundcube"
         # Mysql available on system
         r=$(generate_password)
@@ -192,4 +191,4 @@ fi
 
 
 log_history "Rouncube successfuly installed" '' 'admin'
-log_event "$OK" "$ARGUMENTS"
+log_event "$OK" "$ARGUMENTS"

bin/v-delete-web-domain-fast-cgi-cache

@@ -48,7 +48,7 @@ fi
 
 # Delete cache folder on disabling
 if [ -d /var/cache/nginx/php-fpm/$domain ]; then
-    rm -f /var/cache/nginx/php-fpm/$domain
+    rm -rf /var/cache/nginx/php-fpm/$domain
 fi
 
 #----------------------------------------------------------#
@@ -72,4 +72,4 @@ fi
 log_history "disabled fast cgi support for $domain"
 log_event "$OK" "$ARGUMENTS"
 
-exit
+exit

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

@@ -35,7 +35,7 @@ server {
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         }
     }

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

@@ -30,7 +30,7 @@ server {
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         }
     }

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

@@ -36,7 +36,7 @@ server {
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
             fastcgi_param  SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name;
         }
     }

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

@@ -31,7 +31,7 @@ server {
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
             fastcgi_param  SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name;
         }
     }

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

@@ -36,7 +36,7 @@ server {
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -32,7 +32,7 @@ server {
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -107,7 +107,7 @@ server {
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -105,7 +105,7 @@ server {
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -35,7 +35,7 @@ server {
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -30,7 +30,7 @@ server {
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;     
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;     
         }
     }
 

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

@@ -38,7 +38,7 @@ server {
             fastcgi_index   index.php;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -33,7 +33,7 @@ server {
             fastcgi_index   index.php;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

install/deb/templates/web/nginx/php-fpm/drupal-composer.stpl

@@ -61,7 +61,7 @@ server {
             fastcgi_index index.php;
             fastcgi_param SCRIPT_FILENAME $request_filename;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
 
         location ~ ^/sites/.*/files/styles/ {

install/deb/templates/web/nginx/php-fpm/drupal-composer.tpl

@@ -57,7 +57,7 @@ server {
             fastcgi_index index.php;
             fastcgi_param SCRIPT_FILENAME $request_filename;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
 
         location ~ ^/sites/.*/files/styles/ {

install/deb/templates/web/nginx/php-fpm/drupal-social.stpl

@@ -61,7 +61,7 @@ server {
             fastcgi_index index.php;
             fastcgi_param SCRIPT_FILENAME $request_filename;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
 
         location ~ ^/sites/.*/files/styles/ {

install/deb/templates/web/nginx/php-fpm/drupal-social.tpl

@@ -57,7 +57,7 @@ server {
             fastcgi_index index.php;
             fastcgi_param SCRIPT_FILENAME $request_filename;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
 
         location ~ ^/sites/.*/files/styles/ {

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

@@ -75,7 +75,7 @@ server {
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_pass %backend_lsnr%;             
         include         /etc/nginx/fastcgi_params;
-        include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+        include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
     }
 
     location /error/ {

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

@@ -70,7 +70,7 @@ server {
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_pass %backend_lsnr%;             
         include         /etc/nginx/fastcgi_params;
-        include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+        include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
     }
 
     location /error/ {

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

@@ -76,7 +76,7 @@ server {
             fastcgi_index index.php;
             fastcgi_param SCRIPT_FILENAME $request_filename;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
 
         location ~ ^/sites/.*/files/styles/ {

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

@@ -71,7 +71,7 @@ server {
             fastcgi_index index.php;
             fastcgi_param SCRIPT_FILENAME $request_filename;
             include         /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
 
         location ~ ^/sites/.*/files/styles/ {

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

@@ -76,7 +76,7 @@ server {
             fastcgi_index index.php;
             fastcgi_param SCRIPT_FILENAME $request_filename;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
 
         location ~ ^/sites/.*/files/styles/ {

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

@@ -72,7 +72,7 @@ server {
             fastcgi_index index.php;
             fastcgi_param SCRIPT_FILENAME $request_filename;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
 
         location ~ ^/sites/.*/files/styles/ {

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

@@ -43,7 +43,7 @@ server {
             fastcgi_index   index.php;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -38,7 +38,7 @@ server {
             fastcgi_index   index.php;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -35,7 +35,7 @@ server {
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -29,7 +29,7 @@ server {
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -34,7 +34,7 @@ server {
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
 
         location ~ ^/setup/(?!pub/). {
@@ -57,7 +57,7 @@ server {
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
             fastcgi_param  PATH_INFO        $fastcgi_path_info;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
 
         # Deny everything but index.php
@@ -167,7 +167,7 @@ server {
         fastcgi_index  index.php;
         fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
         include /etc/nginx/fastcgi_params;
-        include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+        include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
     }
 
     gzip on;

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

@@ -29,7 +29,7 @@ server {
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
 
         location ~ ^/setup/(?!pub/). {
@@ -52,7 +52,7 @@ server {
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
             fastcgi_param  PATH_INFO        $fastcgi_path_info;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
 
         # Deny everything but index.php
@@ -162,7 +162,7 @@ server {
         fastcgi_index  index.php;
         fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
         include /etc/nginx/fastcgi_params;
-        include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+        include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
     }
 
     gzip on;

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

@@ -51,7 +51,7 @@ server {
         fastcgi_index index.php;
         fastcgi_param SCRIPT_FILENAME $request_filename;
         include /etc/nginx/fastcgi_params;
-        include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+        include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
     }
 
     location /error/ {

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

@@ -45,7 +45,7 @@ server {
         fastcgi_index index.php;
         fastcgi_param SCRIPT_FILENAME $request_filename;
         include /etc/nginx/fastcgi_params;
-        include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+        include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
     }
 
     location /error/ {

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

@@ -63,7 +63,7 @@ server {
 	    fastcgi_param PHP_VALUE open_basedir="/home/%user%/web/%domain%/private/moodledata:/home/%user%/web/%domain%/public_html:/home/%user%/web/%domain%/public_shtml:/home/%user%/tmp:/var/www/html:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/phppgadmin:/etc/roundcube:/var/lib/roundcube:/tmp:/bin:/usr/bin:/usr/local/bin:/usr/share:/opt";
             fastcgi_intercept_errors on;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -59,7 +59,7 @@ server {
 	    fastcgi_param PHP_VALUE open_basedir="/home/%user%/web/%domain%/private/moodledata:/home/%user%/web/%domain%/public_html:/home/%user%/web/%domain%/public_shtml:/home/%user%/tmp:/var/www/html:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/phppgadmin:/etc/roundcube:/var/lib/roundcube:/tmp:/bin:/usr/bin:/usr/local/bin:/usr/share:/opt";
             fastcgi_intercept_errors on;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -35,7 +35,7 @@ server {
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -29,7 +29,7 @@ server {
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -72,6 +72,7 @@ server {
         fastcgi_pass    %backend_lsnr%;
 		fastcgi_index   index.php;
 		include /etc/nginx/fastcgi_params;
+        include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
     }
 
     location /error/ {

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

@@ -67,6 +67,7 @@ server {
         fastcgi_pass    %backend_lsnr%;
 		fastcgi_index   index.php;
 		include /etc/nginx/fastcgi_params;
+        include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
     }
 
     location /error/ {

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

@@ -64,7 +64,7 @@ server {
             #fastcgi_param HTTPS on;
             fastcgi_pass    %backend_lsnr%;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -59,7 +59,7 @@ server {
             #fastcgi_param HTTPS on;
             fastcgi_pass    %backend_lsnr%;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -43,7 +43,7 @@ server {
 
             fastcgi_pass    %backend_lsnr%;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -38,7 +38,7 @@ server {
 
             fastcgi_pass    %backend_lsnr%;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -120,7 +120,7 @@ server {
             fastcgi_pass %backend_lsnr%;
             fastcgi_index index.php;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -115,7 +115,7 @@ server {
             fastcgi_pass %backend_lsnr%;
             fastcgi_index index.php;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -41,7 +41,7 @@ server {
             fastcgi_index   index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -36,7 +36,7 @@ server {
             fastcgi_index   index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -54,7 +54,7 @@ server {
             fastcgi_pass %backend_lsnr%;
             fastcgi_index index.php;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
 
         location /l/ {

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

@@ -50,7 +50,7 @@ server {
             fastcgi_pass %backend_lsnr%;
             fastcgi_index index.php;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
 
         location /l/ {

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

@@ -61,7 +61,7 @@ server {
             fastcgi_index index.php;
             fastcgi_param SCRIPT_FILENAME $request_filename;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
 
         location ~ ^/sites/.*/files/styles/ {

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

@@ -57,7 +57,7 @@ server {
             fastcgi_index index.php;
             fastcgi_param SCRIPT_FILENAME $request_filename;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
 
         location ~ ^/sites/.*/files/styles/ {

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

@@ -52,7 +52,7 @@ server {
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

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

@@ -47,7 +47,7 @@ server {
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             include /etc/nginx/fastcgi_params;
-            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf;
+            include     %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
         }
     }
 

install/hst-install-debian.sh

@@ -45,7 +45,7 @@ if [ "$release" -eq 9 ]; then
         sudo bc ftp lsof rrdtool quota e2fslibs bsdutils e2fsprogs curl
         imagemagick fail2ban dnsutils bsdmainutils cron hestia=${HESTIA_INSTALL_VER} hestia-nginx
         hestia-php expect libmail-dkim-perl unrar-free vim-common acl sysstat
-        rsyslog openssh-server setpriv ipset libapache2-mod-ruid2"
+        rsyslog openssh-server setpriv ipset libapache2-mod-ruid2 zstd lsb-release"
 elif [ "$release" -eq 10 ]; then
     software="nginx apache2 apache2-utils apache2-suexec-custom
         apache2-suexec-pristine libapache2-mod-fcgid libapache2-mod-php$fpm_v
@@ -62,7 +62,7 @@ elif [ "$release" -eq 10 ]; then
         quota e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
         bsdmainutils cron hestia=${HESTIA_INSTALL_VER} hestia-nginx hestia-php expect
         libmail-dkim-perl unrar-free vim-common acl sysstat rsyslog openssh-server
-        util-linux ipset libapache2-mpm-itk"
+        util-linux ipset libapache2-mpm-itk zstd lsb-release"
 fi
 
 installer_dependencies="apt-transport-https curl dirmngr gnupg wget ca-certificates"
@@ -1629,8 +1629,9 @@ fi
 echo "[ * ] Install Roundcube..."
 # Min requirements Dovecote + Exim + Mysql
 
-if [ "$mysql" == 'yes' ] && [ "$$dovecot" == "yes" ]; then
-    $BIN/v-add-sys-roundcube 
+if [ "$mysql" == 'yes' ] && [ "$dovecot" == "yes" ]; then
+    $HESTIA/bin/v-add-sys-roundcube 
+    echo " WEBMAIL_ALIAS='webmail'" >> $HESTIA/conf/hestia.conf
 fi
 
 #----------------------------------------------------------#

install/hst-install-ubuntu.sh

@@ -44,7 +44,7 @@ software="apache2 apache2.2-common apache2-suexec-custom apache2-utils
     php$fpm_v-opcache php$fpm_v-pspell php$fpm_v-readline php$fpm_v-xml
     postgresql postgresql-contrib proftpd-basic quota rrdtool rssh spamassassin sudo hestia=${HESTIA_INSTALL_VER}
     hestia-nginx hestia-php vim-common vsftpd whois zip acl sysstat setpriv
-    ipset libonig5 libzip5 openssh-server"
+    ipset libonig5 libzip5 openssh-server lsb-release zstd"
 
 installer_dependencies="apt-transport-https curl dirmngr gnupg wget software-properties-common ca-certificates"
 
@@ -562,11 +562,7 @@ echo
 if [ "$nginx" = 'yes' ]; then
     echo "[ * ] NGINX"
     echo "deb [arch=amd64] https://nginx.org/packages/mainline/$VERSION/ $codename nginx" > $apt/nginx.list
-    if [ "$release" = '16.04' ]; then
-        apt-key adv --fetch-keys 'http://nginx.org/keys/nginx_signing.key' > /dev/null 2>&1
-    else
-        apt-key adv --fetch-keys 'https://nginx.org/keys/nginx_signing.key' > /dev/null 2>&1    
-    fi
+    apt-key adv --fetch-keys 'https://nginx.org/keys/nginx_signing.key' > /dev/null 2>&1    
 fi
 
 # Installing sury PHP repo
@@ -583,12 +579,7 @@ fi
 if [ "$mysql" = 'yes' ]; then
     echo "[ * ] MariaDB"
     echo "deb [arch=amd64] https://mirror.mva-n.net/mariadb/repo/$mariadb_v/$VERSION $codename main" > $apt/mariadb.list
-    if [ "$release" = '16.04' ]; then
-        apt-key adv --fetch-keys 'http://mariadb.org/mariadb_release_signing_key.asc' > /dev/null 2>&1
-    else
-        apt-key adv --fetch-keys 'https://mariadb.org/mariadb_release_signing_key.asc' > /dev/null 2>&1
-    fi
-
+    apt-key adv --fetch-keys 'https://mariadb.org/mariadb_release_signing_key.asc' > /dev/null 2>&1
 fi
 
 # Installing HestiaCP repo
@@ -600,11 +591,7 @@ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A189E93654F0B0E5 > /dev
 if [ "$postgresql" = 'yes' ]; then
     echo "[ * ] PostgreSQL"
     echo "deb [arch=amd64] https://apt.postgresql.org/pub/repos/apt/ $codename-pgdg main" > $apt/postgresql.list
-    if [ "$release" = '16.04' ]; then
-        apt-key adv --fetch-keys 'http://www.postgresql.org/media/keys/ACCC4CF8.asc' > /dev/null 2>&1
-    else
-        apt-key adv --fetch-keys 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' > /dev/null 2>&1
-    fi
+    apt-key adv --fetch-keys 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' > /dev/null 2>&1
 fi
 
 # Echo for a new line
@@ -799,10 +786,6 @@ if [ -d "$withdebs" ]; then
     software=$(echo "$software" | sed -e "s/hestia-php//")
     software=$(echo "$software" | sed -e "s/hestia=${HESTIA_INSTALL_VER}//")
 fi
-if [ "$release" = '16.04' ]; then
-    software=$(echo "$software" | sed -e "s/libonig5/libonig2/")
-    software=$(echo "$software" | sed -e "s/libzip5/libzip4/")
-fi
 if [ "$release" = '18.04' ]; then
     software=$(echo "$software" | sed -e "s/libonig5/libonig4/")
     software=$(echo "$software" | sed -e "s/libzip5/libzip4/")
@@ -1446,6 +1429,7 @@ if [ "$mysql" = 'yes' ]; then
     
     # Create copy of config file
     cp -f $HESTIA_INSTALL_DIR/phpmyadmin/config.inc.php /etc/phpmyadmin/
+    mkdir -p /var/lib/phpmyadmin/tmp
     chmod 777 /var/lib/phpmyadmin/tmp
     
     # Set config and log directory
@@ -1453,7 +1437,6 @@ if [ "$mysql" = 'yes' ]; then
     sed -i "s|define('TEMP_DIR', ROOT_PATH . 'tmp/');|define('TEMP_DIR', '/var/lib/phpmyadmin/tmp/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
     
     # Create temporary folder and change permission
-    mkdir /usr/share/phpmyadmin/tmp
     chmod 777 /usr/share/phpmyadmin/tmp
 
     # Generate blow fish
@@ -1670,8 +1653,9 @@ fi
 echo "[ * ] Install Roundcube..."
 # Min requirements Dovecote + Exim + Mysql
 
-if [ "$mysql" == 'yes' ] && [ "$$dovecot" == "yes" ]; then
-    $BIN/v-add-sys-roundcube 
+if [ "$mysql" == 'yes' ] && [ "$dovecot" == "yes" ]; then
+    $HESTIA/bin/v-add-sys-roundcube 
+    echo " WEBMAIL_ALIAS='webmail'" >> $HESTIA/conf/hestia.conf
 fi
 
 

install/hst-install.sh

@@ -62,7 +62,7 @@ no_support_message(){
     echo "Hestia Control Panel. Officially supported releases:"
     echo "****************************************************"
     echo "  Debian 9, 10"
-    echo "  Ubuntu 16.04 LTS, 18.04, 20.04 LTS"
+    echo "  Ubuntu 18.04, 20.04 LTS"
     echo ""
     exit 1;
 }

src/deb/nginx/nginx.conf

@@ -84,7 +84,7 @@ http {
     ssl_ciphers         "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS";
     ssl_dhparam         /etc/ssl/dhparam.pem;
     ssl_ecdh_curve      secp384r1;
-    ssl_reject_handshake on;
+    # ssl_reject_handshake on;
     ssl_session_tickets off;
     resolver 1.0.0.1 1.1.1.1 valid=300s ipv6=off;
     resolver_timeout    5s;

src/lxd_build_all.sh

@@ -13,7 +13,7 @@
 #
 
 # Configs:
-oslist=('debian=9,10' 'ubuntu=16.04,18.04,20.04')
+oslist=('debian=9,10' 'ubuntu=18.04,20.04')
 branch='main'