oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-11 17:51:02 +00:00
Code Wiki Activity

Remove database env vars that are covered by DATABASE_URL

Browse source
This commit is contained in:
Yassine Guedidi 2025-02-17 21:45:17 +01:00
parent bc1b42a3f7
commit 64e9ae12ae
4 changed files with 0 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/AppKernel.php
View file

@ -94,15 +94,7 @@ class AppKernel extends Kernel
private function loadEnvVarsFromParameters(ContainerBuilder $container) private function loadEnvVarsFromParameters(ContainerBuilder $container)
{ {
$this->setEnvVarFromParameter($container, 'DATABASE_HOST', 'database_host');
$this->setEnvVarFromParameter($container, 'DATABASE_PORT', 'database_port');
$this->setEnvVarFromParameter($container, 'DATABASE_NAME', 'database_name');
$this->setEnvVarFromParameter($container, 'DATABASE_USER', 'database_user');
$this->setEnvVarFromParameter($container, 'DATABASE_PASSWORD', 'database_password');
$this->setEnvVarFromParameter($container, 'DATABASE_PATH', 'database_path');
$this->setEnvVarFromParameter($container, 'DATABASE_TABLE_PREFIX', 'database_table_prefix'); $this->setEnvVarFromParameter($container, 'DATABASE_TABLE_PREFIX', 'database_table_prefix');
$this->setEnvVarFromParameter($container, 'DATABASE_SOCKET', 'database_socket');
$this->setEnvVarFromParameter($container, 'DATABASE_CHARSET', 'database_charset');
$this->setEnvVarFromParameter($container, 'DOMAIN_NAME', 'domain_name'); $this->setEnvVarFromParameter($container, 'DOMAIN_NAME', 'domain_name');
$this->setEnvVarFromParameter($container, 'SERVER_NAME', 'server_name'); $this->setEnvVarFromParameter($container, 'SERVER_NAME', 'server_name');

7
docker/mariadb/env
View file

@ -1,9 +1,2 @@
MYSQL_ROOT_PASSWORD=wallaroot MYSQL_ROOT_PASSWORD=wallaroot
MYSQL_DATABASE=wallabag MYSQL_DATABASE=wallabag
DATABASE_DRIVER=pdo_mysql
DATABASE_HOST=mariadb
DATABASE_PORT=3306
DATABASE_NAME=wallabag
DATABASE_USER=root
DATABASE_PASSWORD=wallaroot
DATABASE_CHARSET=utf8mb4

7
docker/php/env.example
View file

@ -1,10 +1,3 @@
DATABASE_DRIVER=pdo_sqlite
DATABASE_HOST=127.0.0.1
DATABASE_PORT=~
DATABASE_NAME=symfony
DATABASE_USER=root
DATABASE_PASSWORD=~
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=tcp://redis:6379?database=2

7
docker/postgres/env
View file

@ -1,10 +1,3 @@
POSTGRES_USER=wallabag POSTGRES_USER=wallabag
POSTGRES_PASSWORD=wallapass POSTGRES_PASSWORD=wallapass
POSTGRES_DB=wallabag POSTGRES_DB=wallabag
DATABASE_HOST=postgres
DATABASE_PORT=5432
DATABASE_NAME=wallabag
DATABASE_USER=wallabag
DATABASE_PASSWORD=wallapass
DATABASE_DRIVER=pdo_pgsql
DATABASE_PATH=null