diff --git a/CHANGELOG.md b/CHANGELOG.md index 716f8787..e9e7969e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this This allows for a better traceability, as the logs generated during those jobs will have a matching UUID as the logs generated during the request the triggered the job. -* [#2087](https://github.com/shlinkio/shlink/issues/2087) Allow `memory_limit` to be configured via the new `MEMORY_LIMIT` env var. +* [#2087](https://github.com/shlinkio/shlink/issues/2087) Allow `memory_limit` to be configured via the new `MEMORY_LIMIT` env var or configuration option. ### Deprecated * *Nothing* diff --git a/composer.json b/composer.json index 1b8832ed..f051f2ca 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "shlinkio/shlink-config": "^3.0", "shlinkio/shlink-event-dispatcher": "dev-main#a2a5d6f as 4.1", "shlinkio/shlink-importer": "^5.3.1", - "shlinkio/shlink-installer": "^9.0", + "shlinkio/shlink-installer": "dev-develop#164e23d as 9.1", "shlinkio/shlink-ip-geolocation": "^4.0", "shlinkio/shlink-json": "^1.1", "spiral/roadrunner": "^2023.3", diff --git a/config/autoload/installer.global.php b/config/autoload/installer.global.php index b6a79679..4ebd6716 100644 --- a/config/autoload/installer.global.php +++ b/config/autoload/installer.global.php @@ -12,6 +12,7 @@ return [ 'installer' => [ 'enabled_options' => [ Option\Server\RuntimeConfigOption::class, + Option\Server\MemoryLimitConfigOption::class, Option\Database\DatabaseDriverConfigOption::class, Option\Database\DatabaseNameConfigOption::class, Option\Database\DatabaseHostConfigOption::class,