mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-11-22 21:02:24 +03:00
Code Issues Projects Releases Packages Wiki Activity

Update to installer with support for matomo

Browse source
This commit is contained in:
Alejandro Celaya 2023-11-11 20:12:39 +01:00
parent 7501eca71e
commit 0edb3e5c2c
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -50,7 +50,7 @@
"shlinkio/shlink-config": "dev-main#cde5d3b as 2.5", "shlinkio/shlink-config": "dev-main#cde5d3b as 2.5",
"shlinkio/shlink-event-dispatcher": "dev-main#faf2582 as 3.1", "shlinkio/shlink-event-dispatcher": "dev-main#faf2582 as 3.1",
"shlinkio/shlink-importer": "dev-main#d621b20 as 5.2", "shlinkio/shlink-importer": "dev-main#d621b20 as 5.2",
"shlinkio/shlink-installer": "dev-develop#c1ef08c as 8.6", "shlinkio/shlink-installer": "dev-develop#c505a19 as 8.6",
"shlinkio/shlink-ip-geolocation": "dev-main#4a1cef8 as 3.3", "shlinkio/shlink-ip-geolocation": "dev-main#4a1cef8 as 3.3",
"shlinkio/shlink-json": "dev-main#e5a111c as 1.1", "shlinkio/shlink-json": "dev-main#e5a111c as 1.1",
"spiral/roadrunner": "^2023.2", "spiral/roadrunner": "^2023.2",

4
config/autoload/installer.global.php
View file

@ -66,6 +66,10 @@ return [
Option\RabbitMq\RabbitMqUserConfigOption::class, Option\RabbitMq\RabbitMqUserConfigOption::class,
Option\RabbitMq\RabbitMqPasswordConfigOption::class, Option\RabbitMq\RabbitMqPasswordConfigOption::class,
Option\RabbitMq\RabbitMqVhostConfigOption::class, Option\RabbitMq\RabbitMqVhostConfigOption::class,
Option\Matomo\MatomoEnabledConfigOption::class,
Option\Matomo\MatomoBaseUrlConfigOption::class,
Option\Matomo\MatomoSiteIdConfigOption::class,
Option\Matomo\MatomoApiTokenConfigOption::class,
], ],
'installation_commands' => [ 'installation_commands' => [

2
config/autoload/matomo.global.php
View file

@ -10,7 +10,7 @@ return [
'enabled' => (bool) EnvVars::MATOMO_ENABLED->loadFromEnv(false), 'enabled' => (bool) EnvVars::MATOMO_ENABLED->loadFromEnv(false),
'base_url' => EnvVars::MATOMO_BASE_URL->loadFromEnv(), 'base_url' => EnvVars::MATOMO_BASE_URL->loadFromEnv(),
'site_id' => EnvVars::MATOMO_SITE_ID->loadFromEnv(), 'site_id' => EnvVars::MATOMO_SITE_ID->loadFromEnv(),
'token' => EnvVars::MATOMO_TOKEN->loadFromEnv(), 'token' => EnvVars::MATOMO_API_TOKEN->loadFromEnv(),
], ],
]; ];

2
docker-compose.yml
View file

@ -211,7 +211,7 @@ services:
ports: ports:
- "8003:80" - "8003:80"
volumes: volumes:
# Matomo does not persist port in trusted hosts. This is needed to edit config afterwards # Matomo does not persist port in trusted hosts. This is needed to edit config afterward
# https://github.com/matomo-org/matomo/issues/9549 # https://github.com/matomo-org/matomo/issues/9549
- ./data/infra/matomo:/var/www/html - ./data/infra/matomo:/var/www/html
links: links:

2
module/Core/src/Config/EnvVars.php
View file

@ -35,7 +35,7 @@ enum EnvVars: string
case MATOMO_ENABLED = 'MATOMO_ENABLED'; case MATOMO_ENABLED = 'MATOMO_ENABLED';
case MATOMO_BASE_URL = 'MATOMO_BASE_URL'; case MATOMO_BASE_URL = 'MATOMO_BASE_URL';
case MATOMO_SITE_ID = 'MATOMO_SITE_ID'; case MATOMO_SITE_ID = 'MATOMO_SITE_ID';
case MATOMO_TOKEN = 'MATOMO_TOKEN'; case MATOMO_API_TOKEN = 'MATOMO_API_TOKEN';
case DEFAULT_QR_CODE_SIZE = 'DEFAULT_QR_CODE_SIZE'; case DEFAULT_QR_CODE_SIZE = 'DEFAULT_QR_CODE_SIZE';
case DEFAULT_QR_CODE_MARGIN = 'DEFAULT_QR_CODE_MARGIN'; case DEFAULT_QR_CODE_MARGIN = 'DEFAULT_QR_CODE_MARGIN';
case DEFAULT_QR_CODE_FORMAT = 'DEFAULT_QR_CODE_FORMAT'; case DEFAULT_QR_CODE_FORMAT = 'DEFAULT_QR_CODE_FORMAT';