aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2015-12-03 08:43:40 +0100
committerJeremy Benoist <j0k3r@users.noreply.github.com>2015-12-03 08:43:40 +0100
commitf4b617f2ffd33cf3c3a342e0e3f5450e3e9f7fc2 (patch)
tree68362ee57075f1b733b53360d81982bc947155aa
parent0a0c600887dde4cc755de0862a3301830c415882 (diff)
parent59507c5b24a0f4d68e5798dd9fa995d1e6dac416 (diff)
downloadwallabag-f4b617f2ffd33cf3c3a342e0e3f5450e3e9f7fc2.tar.gz
wallabag-f4b617f2ffd33cf3c3a342e0e3f5450e3e9f7fc2.tar.zst
wallabag-f4b617f2ffd33cf3c3a342e0e3f5450e3e9f7fc2.zip
Merge pull request #1518 from mathbruyen/smtp-from-env
Set SMTP from environment variables
-rw-r--r--composer.json11
1 files changed, 10 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index b6a9c854..5892dc1a 100644
--- a/composer.json
+++ b/composer.json
@@ -85,6 +85,9 @@
85 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", 85 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
86 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", 86 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
87 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" 87 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
88 ],
89 "build-parameters": [
90 "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
88 ] 91 ]
89 }, 92 },
90 "extra": { 93 "extra": {
@@ -92,7 +95,13 @@
92 "symfony-web-dir": "web", 95 "symfony-web-dir": "web",
93 "symfony-assets-install": "relative", 96 "symfony-assets-install": "relative",
94 "incenteev-parameters": { 97 "incenteev-parameters": {
95 "file": "app/config/parameters.yml" 98 "file": "app/config/parameters.yml",
99 "env-map": {
100 "mailer_host": "WALLABAG_MAILER_HOST",
101 "mailer_user": "WALLABAG_MAILER_USER",
102 "mailer_password": "WALLABAG_MAILER_PASSWORD",
103 "secret": "WALLABAG_SECRET"
104 }
96 } 105 }
97 }, 106 },
98 "autoload": { 107 "autoload": {