From 20575a2b0f232fa0d7d53f01299db1cba64fc639 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Thu, 15 Jul 2021 18:57:32 +0200
Subject: [PATCH] Added support to provide append_extra_path config from
 installer or env vars for docker

---
 composer.json                            | 2 +-
 config/autoload/installer.global.php     | 1 +
 docker/config/shlink_in_docker.local.php | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 4571e63e..7d637a60 100644
--- a/composer.json
+++ b/composer.json
@@ -51,7 +51,7 @@
         "shlinkio/shlink-config": "^1.0",
         "shlinkio/shlink-event-dispatcher": "^2.1",
         "shlinkio/shlink-importer": "^2.3",
-        "shlinkio/shlink-installer": "^6.0",
+        "shlinkio/shlink-installer": "dev-develop#fa6a4ca as 6.1",
         "shlinkio/shlink-ip-geolocation": "^2.0",
         "symfony/console": "^5.1",
         "symfony/filesystem": "^5.1",
diff --git a/config/autoload/installer.global.php b/config/autoload/installer.global.php
index 0a72c6fa..0a3374e1 100644
--- a/config/autoload/installer.global.php
+++ b/config/autoload/installer.global.php
@@ -42,6 +42,7 @@ return [
             Option\UrlShortener\RedirectStatusCodeConfigOption::class,
             Option\UrlShortener\RedirectCacheLifeTimeConfigOption::class,
             Option\UrlShortener\AutoResolveTitlesConfigOption::class,
+            Option\UrlShortener\AppendExtraPathConfigOption::class,
             Option\Tracking\IpAnonymizationConfigOption::class,
             Option\Tracking\OrphanVisitsTrackingConfigOption::class,
             Option\Tracking\DisableTrackParamConfigOption::class,
diff --git a/docker/config/shlink_in_docker.local.php b/docker/config/shlink_in_docker.local.php
index 2f1c9499..d4526f50 100644
--- a/docker/config/shlink_in_docker.local.php
+++ b/docker/config/shlink_in_docker.local.php
@@ -111,9 +111,10 @@ return [
         'validate_url' => (bool) env('VALIDATE_URLS', false),
         'visits_webhooks' => $helper->getVisitsWebhooks(),
         'default_short_codes_length' => $helper->getDefaultShortCodesLength(),
+        'auto_resolve_titles' => (bool) env('AUTO_RESOLVE_TITLES', false),
         'redirect_status_code' => (int) env('REDIRECT_STATUS_CODE', DEFAULT_REDIRECT_STATUS_CODE),
         'redirect_cache_lifetime' => (int) env('REDIRECT_CACHE_LIFETIME', DEFAULT_REDIRECT_CACHE_LIFETIME),
-        'auto_resolve_titles' => (bool) env('AUTO_RESOLVE_TITLES', false),
+        'append_extra_path' => (bool) env('REDIRECT_APPEND_EXTRA_PATH', false),
     ],
 
     'tracking' => [