diff options
| author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2019-05-29 11:14:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-29 11:14:00 +0200 |
| commit | 73ec68b1ffafb792265a3805833e5cd84c966aed (patch) | |
| tree | 33c6040c050f85c537f8dbf5e91d8c281db092cd /app/config/parameters.yml.dist | |
| parent | 2ba365c7c49556cd23b444dc3bb8d4a8cf08809d (diff) | |
| parent | 2cbee36a0184786644470a84fdd8c720cfcac58e (diff) | |
| download | wallabag-73ec68b1ffafb792265a3805833e5cd84c966aed.tar.gz wallabag-73ec68b1ffafb792265a3805833e5cd84c966aed.tar.zst wallabag-73ec68b1ffafb792265a3805833e5cd84c966aed.zip | |
Merge pull request #3984 from wallabag/2.4
Merge 2.4 into master
Diffstat (limited to 'app/config/parameters.yml.dist')
| -rw-r--r-- | app/config/parameters.yml.dist | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 6b0cb8e8..13e2584f 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
| @@ -11,8 +11,6 @@ parameters: | |||
| 11 | # database_password: %env.database_password% | 11 | # database_password: %env.database_password% |
| 12 | 12 | ||
| 13 | database_driver: pdo_mysql | 13 | database_driver: pdo_mysql |
| 14 | database_driver_class: ~ | ||
| 15 | # database_driver_class: Wallabag\CoreBundle\Doctrine\DBAL\Driver\CustomPostgreSQLDriver | ||
| 16 | database_host: 127.0.0.1 | 14 | database_host: 127.0.0.1 |
| 17 | database_port: ~ | 15 | database_port: ~ |
| 18 | database_name: wallabag | 16 | database_name: wallabag |
| @@ -27,10 +25,13 @@ parameters: | |||
| 27 | 25 | ||
| 28 | domain_name: https://your-wallabag-url-instance.com | 26 | domain_name: https://your-wallabag-url-instance.com |
| 29 | 27 | ||
| 30 | mailer_transport: smtp | 28 | mailer_transport: smtp |
| 31 | mailer_host: 127.0.0.1 | 29 | mailer_user: ~ |
| 32 | mailer_user: ~ | 30 | mailer_password: ~ |
| 33 | mailer_password: ~ | 31 | mailer_host: 127.0.0.1 |
| 32 | mailer_port: false | ||
| 33 | mailer_encryption: ~ | ||
| 34 | mailer_auth_mode: ~ | ||
| 34 | 35 | ||
| 35 | locale: en | 36 | locale: en |
| 36 | 37 | ||