Fix/2021 03 install issues (hestiacp#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 
hestiacp#1653

* Delete files recursive

* Remove double space

* Use shorten form for -r -f

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

Author: jaapmarcus

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*;
         }
     }