diff --git a/install/froxlor.sql.php b/install/froxlor.sql.php index 57901d03..82f49de8 100644 --- a/install/froxlor.sql.php +++ b/install/froxlor.sql.php @@ -696,7 +696,7 @@ opcache.validate_timestamps'), ('system', 'distribution', ''), ('system', 'update_channel', 'stable'), ('system', 'updatecheck_data', ''), - ('system', 'update_notify_last', '2.0.19'), + ('system', 'update_notify_last', '2.0.20'), ('system', 'traffictool', 'goaccess'), ('system', 'req_limit_per_interval', 60), ('system', 'req_limit_interval', 60), @@ -743,7 +743,7 @@ opcache.validate_timestamps'), ('panel', 'logo_overridetheme', '0'), ('panel', 'logo_overridecustom', '0'), ('panel', 'settings_mode', '0'), - ('panel', 'version', '2.0.19'), + ('panel', 'version', '2.0.20'), ('panel', 'db_version', '202305240'); diff --git a/install/updates/froxlor/update_2.x.inc.php b/install/updates/froxlor/update_2.x.inc.php index 30eafde4..bd443a0d 100644 --- a/install/updates/froxlor/update_2.x.inc.php +++ b/install/updates/froxlor/update_2.x.inc.php @@ -493,6 +493,11 @@ if (Froxlor::isFroxlorVersion('2.0.18')) { Froxlor::updateToVersion('2.0.19'); } +if (Froxlor::isFroxlorVersion('2.0.19')) { + Update::showUpdateStep("Updating from 2.0.19 to 2.0.20", false); + Froxlor::updateToVersion('2.0.20'); +} + if (Froxlor::isDatabaseVersion('202304260')) { Update::showUpdateStep("Cleaning domains table"); Database::query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` DROP COLUMN `ismainbutsubto`;"); diff --git a/lib/Froxlor/Cron/Http/Nginx.php b/lib/Froxlor/Cron/Http/Nginx.php index 3d2ad85e..55b02a96 100644 --- a/lib/Froxlor/Cron/Http/Nginx.php +++ b/lib/Froxlor/Cron/Http/Nginx.php @@ -225,7 +225,7 @@ class Nginx extends HttpConfigBase $this->nginx_data[$vhost_filename] .= "\t" . '}' . "\n"; // protect bin/ - $this->nginx_data[$vhost_filename] .= "\t" . 'location ~ ' . rtrim($relpath, "/") . '/(bin|cache|logs|tests|vendor) {' . "\n"; + $this->nginx_data[$vhost_filename] .= "\t" . 'location ~ ^' . rtrim($relpath, "/") . '/(bin|cache|logs|tests|vendor) {' . "\n"; $this->nginx_data[$vhost_filename] .= "\t" . ' deny all;' . "\n"; $this->nginx_data[$vhost_filename] .= "\t" . '}' . "\n"; } diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php index 39f4aab5..935b1092 100644 --- a/lib/Froxlor/Froxlor.php +++ b/lib/Froxlor/Froxlor.php @@ -31,7 +31,7 @@ final class Froxlor { // Main version variable - const VERSION = '2.0.19'; + const VERSION = '2.0.20'; // Database version (YYYYMMDDC where C is a daily counter) const DBVERSION = '202305240';