Skip to content

Commit a1ea7fd

Browse files
authored
Merge pull request hestiacp#1443 from hestiacp/main
merge main to staging.
2 parents 3fc7964 + a236035 commit a1ea7fd

File tree

5 files changed

+15
-7
lines changed

5 files changed

+15
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ bash hst-install.sh -h
6666
```
6767
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.
6868

69-
Installing Hestia Control Panel
69+
How to upgrade an existing installation
7070
============================
7171
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:
7272
```bash

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ server {
6161

6262
location ~ [^/]\.php(/|$) {
6363
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
64-
if (!-f $document_root$fastcgi_script_name) {
65-
return 404;
66-
}
64+
fastcgi_split_path_info ^(.+\.php)($|/.*);
65+
try_files $fastcgi_script_name =404;
6766

6867
fastcgi_pass %backend_lsnr%;
6968
fastcgi_index index.php;
7069
fastcgi_param SCRIPT_FILENAME $request_filename;
70+
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";
7171
fastcgi_intercept_errors on;
7272
include /etc/nginx/fastcgi_params;
7373
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ server {
5757

5858
location ~ [^/]\.php(/|$) {
5959
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
60-
if (!-f $document_root$fastcgi_script_name) {
61-
return 404;
62-
}
60+
fastcgi_split_path_info ^(.+\.php)($|/.*);
61+
try_files $fastcgi_script_name =404;
6362
6463
fastcgi_pass %backend_lsnr%;
6564
fastcgi_index index.php;
6665
fastcgi_param SCRIPT_FILENAME $request_filename;
66+
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";
6767
fastcgi_intercept_errors on;
6868
include /etc/nginx/fastcgi_params;
6969
}

install/hst-install-debian.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,10 @@ echo "LOGIN_STYLE='default'" >> $HESTIA/conf/hestia.conf
10931093
echo "VERSION='${HESTIA_INSTALL_VER}'" >> $HESTIA/conf/hestia.conf
10941094
echo "RELEASE_BRANCH='release'" >> $HESTIA/conf/hestia.conf
10951095

1096+
# Email notifications after upgrade
1097+
echo "UPGRADE_SEND_EMAIL='true'" >> $HESTIA/conf/hestia.conf
1098+
echo "UPGRADE_SEND_EMAIL_LOG='true'" >> $HESTIA/conf/hestia.conf
1099+
10961100
# Installing hosting packages
10971101
cp -rf $HESTIA_INSTALL_DIR/packages $HESTIA/data/
10981102

install/hst-install-ubuntu.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,6 +1144,10 @@ echo "LOGIN_STYLE='default'" >> $HESTIA/conf/hestia.conf
11441144
echo "VERSION='${HESTIA_INSTALL_VER}'" >> $HESTIA/conf/hestia.conf
11451145
echo "RELEASE_BRANCH='release'" >> $HESTIA/conf/hestia.conf
11461146

1147+
# Email notifications after upgrade
1148+
echo "UPGRADE_SEND_EMAIL='true'" >> $HESTIA/conf/hestia.conf
1149+
echo "UPGRADE_SEND_EMAIL_LOG='true'" >> $HESTIA/conf/hestia.conf
1150+
11471151
# Installing hosting packages
11481152
cp -rf $HESTIA_INSTALL_DIR/packages $HESTIA/data/
11491153

0 commit comments

Comments
 (0)