Преглед изворни кода

Merge pull request #1443 from hestiacp/main

merge main to staging.
Raphael Schneeberger пре 5 година
родитељ
комит
a1ea7fd7d1

+ 1 - 1
README.md

@@ -66,7 +66,7 @@ bash hst-install.sh -h
 ```
 Alternatively, @gabizz has made available a command-line script generator at https://gabizz.github.io/hestiacp-scriptline-generator/ which allows you to easily generate the installation command via GUI.
 
-Installing Hestia Control Panel
+How to upgrade an existing installation
 ============================
 Automatic Updates are enabled by default on new installations of Hestia Control Panel and can be managed from **Server Settings > Updates**. To manually check for and install available updates, use the apt package manager:
 ```bash

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

@@ -61,13 +61,13 @@ server {
 
         location ~ [^/]\.php(/|$) {
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            if (!-f $document_root$fastcgi_script_name) {
-                return  404;
-            }
+	    fastcgi_split_path_info ^(.+\.php)($|/.*);
+            try_files $fastcgi_script_name =404;
 
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             fastcgi_param SCRIPT_FILENAME $request_filename;
+	    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;
         }

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

@@ -57,13 +57,13 @@ server {
 
         location ~ [^/]\.php(/|$) {
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            if (!-f $document_root$fastcgi_script_name) {
-                return  404;
-            }
+	    fastcgi_split_path_info ^(.+\.php)($|/.*);
+            try_files $fastcgi_script_name =404;
 
             fastcgi_pass    %backend_lsnr%;
             fastcgi_index   index.php;
             fastcgi_param SCRIPT_FILENAME $request_filename;
+	    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;
         }

+ 4 - 0
install/hst-install-debian.sh

@@ -1093,6 +1093,10 @@ echo "LOGIN_STYLE='default'" >> $HESTIA/conf/hestia.conf
 echo "VERSION='${HESTIA_INSTALL_VER}'" >> $HESTIA/conf/hestia.conf
 echo "RELEASE_BRANCH='release'" >> $HESTIA/conf/hestia.conf
 
+# Email notifications after upgrade
+echo "UPGRADE_SEND_EMAIL='true'" >> $HESTIA/conf/hestia.conf
+echo "UPGRADE_SEND_EMAIL_LOG='true'" >> $HESTIA/conf/hestia.conf
+
 # Installing hosting packages
 cp -rf $HESTIA_INSTALL_DIR/packages $HESTIA/data/
 

+ 4 - 0
install/hst-install-ubuntu.sh

@@ -1144,6 +1144,10 @@ echo "LOGIN_STYLE='default'" >> $HESTIA/conf/hestia.conf
 echo "VERSION='${HESTIA_INSTALL_VER}'" >> $HESTIA/conf/hestia.conf
 echo "RELEASE_BRANCH='release'" >> $HESTIA/conf/hestia.conf
 
+# Email notifications after upgrade
+echo "UPGRADE_SEND_EMAIL='true'" >> $HESTIA/conf/hestia.conf
+echo "UPGRADE_SEND_EMAIL_LOG='true'" >> $HESTIA/conf/hestia.conf
+
 # Installing hosting packages
 cp -rf $HESTIA_INSTALL_DIR/packages $HESTIA/data/