Skip to content

Commit 15827bd

Browse files
jaapmarcusjaapmarcus
committed
Merge branch 'main' into release
2 parents b50c674 + 3af4b57 commit 15827bd

28 files changed

+197
-138
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4+
## [1.5.4] - Service release
5+
6+
### Features
7+
8+
### Bugfixes
9+
10+
- Fixed an issue with v-add-sys-phpmailer not updating properly (#2336)
11+
- Fixed an issue where users where not able to download backups via UI (#2335)
12+
- Fixed an issue where php8.0 got "rounded" to php8 causing default.tpl falling back to 8.1 (#2340)
13+
- Fixed an issue with recalculating disk usage (#2341)
14+
- Fixed an issue where php files where still executable in upload folder Wordpress
15+
- Fixed an bug where version numbers includeing revisions (-x) where unable to build properly
16+
417
## [1.5.3] - Service release
518

619
### Features

‎bin/v-add-sys-phpmailer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ mkdir -p ${PM_INSTALL_DIR}/vendor
6666
chown $user: -R ${PM_INSTALL_DIR}/vendor
6767

6868
openssl_installed=$(/usr/local/hestia/php/bin/php -m | grep openssl);
69-
if [ -z "$openssl_version" ]; then
69+
if [ -z "$openssl_installed" ]; then
7070
COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec /usr/bin/php $COMPOSER_BIN --quiet --no-dev install
7171
else
7272
COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec /usr/local/hestia/php/bin/php $COMPOSER_BIN --quiet --no-dev install

‎bin/v-update-web-domains-disk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ is_object_valid 'user' 'USER' "$user"
3535
#----------------------------------------------------------#
3636

3737
# Loop through all domains that are not suspended
38-
for domain in $($BIN/v-list-web-domains $user plan | cut -f 1); do
38+
for domain in $($BIN/v-list-web-domains $user plain | cut -f 1); do
3939
home_dir="$HOMEDIR/$user/web/$domain/"
4040
if [ -e "$home_dir" ]; then
4141
disk_usage=$(nice -n 19 du -shm $home_dir | cut -f 1 )

‎func/main.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1308,7 +1308,7 @@ multiphp_versions() {
13081308

13091309
multiphp_default_version() {
13101310
# Get system wide default php version (set by update-alternatives)
1311-
local sys_phpversion=$(php -r "echo (float)phpversion();")
1311+
local sys_phpversion=$(php -r "echo substr(phpversion(),0,3);")
13121312

13131313
# Check if the system php also has php-fpm enabled, otherwise return
13141314
# the most recent php version which does have it installed.

‎install/deb/templates/web/awstats/awstats.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ PurgeLogFile=0
2424
ArchiveLogRecords=0
2525
KeepBackupOfHistoricFiles=1
2626
DefaultFile="index.php index.html"
27-
SkipHosts="127.0.0.1
27+
SkipHosts="127.0.0.1"
2828
SkipUserAgents=""
2929
SkipFiles=""
3030
SkipReferrersBlackList=""

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,11 @@ server {
3030
access_log off;
3131
}
3232

33-
location ~ \..*/.*\.php$ {
34-
deny all;
35-
return 404;
36-
}
37-
3833
location ~ ^/sites/.*/private/ {
3934
deny all;
4035
return 404;
4136
}
4237

43-
location ~ ^/sites/[^/]+/files/.*\.php$ {
44-
deny all;
45-
return 404;
46-
}
47-
4838
location ~ /\.(?!well-known\/) {
4939
deny all;
5040
return 404;
@@ -57,7 +47,17 @@ server {
5747
expires 30d;
5848
fastcgi_hide_header "Set-Cookie";
5949
}
60-
50+
51+
location ~ \..*/.*\.php$ {
52+
deny all;
53+
return 404;
54+
}
55+
56+
location ~ ^/sites/[^/]+/files/.*\.php$ {
57+
deny all;
58+
return 404;
59+
}
60+
6161
location ~ [^/]\.php(/|$)|^/update.php {
6262
fastcgi_split_path_info ^(.+?\.php)(|/.*)$;
6363
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,11 @@ server {
2525
access_log off;
2626
}
2727

28-
location ~ \..*/.*\.php$ {
29-
deny all;
30-
return 404;
31-
}
32-
3328
location ~ ^/sites/.*/private/ {
3429
deny all;
3530
return 404;
3631
}
3732

38-
location ~ ^/sites/[^/]+/files/.*\.php$ {
39-
deny all;
40-
return 404;
41-
}
4233

4334
location ~ /\.(?!well-known\/) {
4435
deny all;
@@ -53,6 +44,16 @@ server {
5344
expires 30d;
5445
fastcgi_hide_header "Set-Cookie";
5546
}
47+
48+
location ~ \..*/.*\.php$ {
49+
deny all;
50+
return 404;
51+
}
52+
53+
location ~ ^/sites/[^/]+/files/.*\.php$ {
54+
deny all;
55+
return 404;
56+
}
5657

5758
location ~ [^/]\.php(/|$)|^/update.php {
5859
fastcgi_split_path_info ^(.+?\.php)(|/.*)$;

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,11 @@ server {
3030
access_log off;
3131
}
3232

33-
location ~ \..*/.*\.php$ {
34-
deny all;
35-
return 404;
36-
}
37-
3833
location ~ ^/sites/.*/private/ {
3934
deny all;
4035
return 404;
4136
}
4237

43-
location ~ ^/sites/[^/]+/files/.*\.php$ {
44-
deny all;
45-
return 404;
46-
}
47-
4838
location ~ /\.(?!well-known\/) {
4939
deny all;
5040
return 404;
@@ -57,6 +47,16 @@ server {
5747
expires 30d;
5848
fastcgi_hide_header "Set-Cookie";
5949
}
50+
51+
location ~ \..*/.*\.php$ {
52+
deny all;
53+
return 404;
54+
}
55+
56+
location ~ ^/sites/[^/]+/files/.*\.php$ {
57+
deny all;
58+
return 404;
59+
}
6060

6161
location ~ [^/]\.php(/|$)|^/update.php {
6262
fastcgi_split_path_info ^(.+?\.php)(|/.*)$;

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,11 @@ server {
2525
access_log off;
2626
}
2727

28-
location ~ \..*/.*\.php$ {
29-
deny all;
30-
return 404;
31-
}
32-
3328
location ~ ^/sites/.*/private/ {
3429
deny all;
3530
return 404;
3631
}
3732

38-
location ~ ^/sites/[^/]+/files/.*\.php$ {
39-
deny all;
40-
return 404;
41-
}
42-
4333
location ~ /\.(?!well-known\/) {
4434
deny all;
4535
return 404;
@@ -53,6 +43,16 @@ server {
5343
expires 30d;
5444
fastcgi_hide_header "Set-Cookie";
5545
}
46+
47+
location ~ \..*/.*\.php$ {
48+
deny all;
49+
return 404;
50+
}
51+
52+
location ~ ^/sites/[^/]+/files/.*\.php$ {
53+
deny all;
54+
return 404;
55+
}
5656

5757
location ~ [^/]\.php(/|$)|^/update.php {
5858
fastcgi_split_path_info ^(.+?\.php)(|/.*)$;

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,12 @@ server {
3434
deny all;
3535
return 404;
3636
}
37-
38-
location ~ \..*/.*\.php$ {
39-
deny all;
40-
return 404;
41-
}
42-
37+
4338
location ~ ^/sites/.*/private/ {
4439
deny all;
4540
return 404;
4641
}
4742

48-
location ~ ^/sites/[^/]+/files/.*\.php$ {
49-
deny all;
50-
return 404;
51-
}
52-
5343
location ~ /vendor/.*\.php$ {
5444
deny all;
5545
return 404;
@@ -67,7 +57,17 @@ server {
6757
expires 30d;
6858
fastcgi_hide_header "Set-Cookie";
6959
}
70-
60+
61+
location ~ \..*/.*\.php$ {
62+
deny all;
63+
return 404;
64+
}
65+
66+
location ~ ^/sites/[^/]+/files/.*\.php$ {
67+
deny all;
68+
return 404;
69+
}
70+
7171
location ~ [^/]\.php(/|$)|^/update.php {
7272
fastcgi_split_path_info ^(.+?\.php)(|/.*)$;
7373
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

0 commit comments

Comments
 (0)