diff options
author | Mathieu Bruyen <code@mais-h.eu> | 2016-02-25 09:19:12 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-03-29 13:44:12 +0200 |
commit | 0bb5669cf602aa5aa2aae76299328827a1c290c5 (patch) | |
tree | b410847779927f60bf2396252b56d757c0e451aa | |
parent | b63752652485b1f62679db002cba945c46010367 (diff) | |
download | wallabag-0bb5669cf602aa5aa2aae76299328827a1c290c5.tar.gz wallabag-0bb5669cf602aa5aa2aae76299328827a1c290c5.tar.zst wallabag-0bb5669cf602aa5aa2aae76299328827a1c290c5.zip |
Remove SMTP configuration environment overrides
SMTP configuration has been added in #1518 to use ParameterHandle's
env-map. But Symfony actually has a native way of allowing parameters to
be overriden from environment so rather than having to define a mapping
for each possible parameter, users can define any override in
parameters.yml:
> parameters:
> database_host: %WALLABAG_DB_HOST%
and define an environment variable SYMFONY__WALLABAG_DB_HOST.
Links:
env-map: https://github.com/Incenteev/ParameterHandler#using-environment-variables-to-set-the-parameters
Symfony external parameters: http://symfony.com/doc/current/cookbook/configuration/external_parameters.html
-rw-r--r-- | composer.json | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/composer.json b/composer.json index 1abf6f20..4c3fbdaf 100644 --- a/composer.json +++ b/composer.json | |||
@@ -90,11 +90,8 @@ | |||
90 | "fabpot/php-cs-fixer": "~1.9" | 90 | "fabpot/php-cs-fixer": "~1.9" |
91 | }, | 91 | }, |
92 | "scripts": { | 92 | "scripts": { |
93 | "build-parameters": [ | ||
94 | "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters" | ||
95 | ], | ||
96 | "post-cmd": [ | 93 | "post-cmd": [ |
97 | "@build-parameters", | 94 | "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", |
98 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", | 95 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", |
99 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", | 96 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", |
100 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", | 97 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", |
@@ -116,13 +113,7 @@ | |||
116 | "symfony-tests-dir": "tests", | 113 | "symfony-tests-dir": "tests", |
117 | "symfony-assets-install": "relative", | 114 | "symfony-assets-install": "relative", |
118 | "incenteev-parameters": { | 115 | "incenteev-parameters": { |
119 | "file": "app/config/parameters.yml", | 116 | "file": "app/config/parameters.yml" |
120 | "env-map": { | ||
121 | "mailer_host": "WALLABAG_MAILER_HOST", | ||
122 | "mailer_user": "WALLABAG_MAILER_USER", | ||
123 | "mailer_password": "WALLABAG_MAILER_PASSWORD", | ||
124 | "secret": "WALLABAG_SECRET" | ||
125 | } | ||
126 | } | 117 | } |
127 | }, | 118 | }, |
128 | "autoload": { | 119 | "autoload": { |