oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-06-27 16:36:00 +00:00
Code Wiki Activity

Merge pull request #8028 from wallabag/introduce-a-redis_url

Browse source 
Introduce a REDIS_URL
This commit is contained in:
Yassine Guedidi 2025-02-24 08:04:50 +01:00 • committed by GitHub
commit 598515868c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/AppKernel.php
View file

@ -77,6 +77,7 @@ class AppKernel extends Kernel
$loader->load(function (ContainerBuilder $container) { $loader->load(function (ContainerBuilder $container) {
$this->processDatabaseParameters($container); $this->processDatabaseParameters($container);
$this->defineRedisUrlEnvVar($container);
}); });
} }
@ -112,4 +113,29 @@ class AppKernel extends Kernel
$container->setParameter('database_port', (string) $container->getParameter('database_port')); $container->setParameter('database_port', (string) $container->getParameter('database_port'));
$container->setParameter('database_socket', (string) $container->getParameter('database_socket')); $container->setParameter('database_socket', (string) $container->getParameter('database_socket'));
} }
private function defineRedisUrlEnvVar(ContainerBuilder $container)
{
$scheme = $container->getParameter('redis_scheme');
$host = $container->getParameter('redis_host');
$port = $container->getParameter('redis_port');
$path = $container->getParameter('redis_path');
$password = $container->getParameter('redis_password');
$url = $scheme . '://';
if ($password) {
$url .= $password . '@';
}
$url .= $host;
if ($port) {
$url .= ':' . $port;
}
$url .= '/' . ltrim($path, '/');
$container->setParameter('env(REDIS_URL)', $url);
}
} }

2
app/config/parameters.yml.dist
View file

@ -55,7 +55,7 @@ parameters:
rabbitmq_prefetch_count: 10 rabbitmq_prefetch_count: 10
# Redis processing # Redis processing
redis_scheme: tcp redis_scheme: redis
redis_host: localhost redis_host: localhost
redis_port: 6379 redis_port: 6379
redis_path: null redis_path: null

7
app/config/services.yml
View file

@ -248,12 +248,7 @@ services:
Predis\Client: Predis\Client:
arguments: arguments:
$parameters: $parameters: '%env(REDIS_URL)%'
scheme: '%redis_scheme%'
host: '%redis_host%'
port: '%redis_port%'
path: '%redis_path%'
password: '%redis_password%'
Wallabag\Event\Subscriber\SQLiteCascadeDeleteSubscriber: Wallabag\Event\Subscriber\SQLiteCascadeDeleteSubscriber:
tags: tags:

2
docker/php/config/parameters.yml
View file

@ -40,7 +40,7 @@ parameters:
rabbitmq_prefetch_count: ${RABBITMQ_PREFETCH_COUNT:-10} rabbitmq_prefetch_count: ${RABBITMQ_PREFETCH_COUNT:-10}
# Redis processing # Redis processing
redis_scheme: ${REDIS_SCHEME:-tcp} redis_scheme: ${REDIS_SCHEME:-redis}
redis_host: ${REDIS_HOST:-redis} redis_host: ${REDIS_HOST:-redis}
redis_port: ${REDIS_PORT:-6379} redis_port: ${REDIS_PORT:-6379}
redis_path: ${REDIS_PATH:-~} redis_path: ${REDIS_PATH:-~}

2
docker/php/env.example
View file

@ -7,6 +7,6 @@ DATABASE_PASSWORD=~
DATABASE_PATH='"%kernel.project_dir%/data/db/wallabag.sqlite"' DATABASE_PATH='"%kernel.project_dir%/data/db/wallabag.sqlite"'
DOMAIN_NAME=http://localhost:8000 DOMAIN_NAME=http://localhost:8000
SECRET=ch4n63m31fy0uc4n SECRET=ch4n63m31fy0uc4n
PHP_SESSION_SAVE_PATH=tcp://redis:6379?database=2 PHP_SESSION_SAVE_PATH=redis://redis:6379?database=2
PHP_SESSION_HANDLER=redis PHP_SESSION_HANDLER=redis
TRUSTED_PROXIES=0.0.0.0/0 TRUSTED_PROXIES=0.0.0.0/0