aboutsummaryrefslogtreecommitdiffhomepage
path: root/composer.json
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-04-08 21:03:17 +0200
committerJeremy Benoist <j0k3r@users.noreply.github.com>2016-04-08 21:03:17 +0200
commit015e4284f0628750e5d2ce1de27fafe964286562 (patch)
tree647f71f67d53312caf2044e086465b68466c8529 /composer.json
parente969c2a7efe1dd6c1dd13bd8726591f7163397d5 (diff)
parent7704ef5d3fccf99d7c1ecf72869b7c0c3a8e43bb (diff)
downloadwallabag-015e4284f0628750e5d2ce1de27fafe964286562.tar.gz
wallabag-015e4284f0628750e5d2ce1de27fafe964286562.tar.zst
wallabag-015e4284f0628750e5d2ce1de27fafe964286562.zip
Merge pull request #1824 from wallabag/v2-alternative-env
Remove SMTP configuration environment overrides
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json13
1 files changed, 2 insertions, 11 deletions
diff --git a/composer.json b/composer.json
index aa120970..7dbc6772 100644
--- a/composer.json
+++ b/composer.json
@@ -91,11 +91,8 @@
91 "fabpot/php-cs-fixer": "~1.9" 91 "fabpot/php-cs-fixer": "~1.9"
92 }, 92 },
93 "scripts": { 93 "scripts": {
94 "build-parameters": [
95 "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
96 ],
97 "post-cmd": [ 94 "post-cmd": [
98 "@build-parameters", 95 "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
99 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", 96 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
100 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", 97 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
101 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", 98 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
@@ -117,13 +114,7 @@
117 "symfony-tests-dir": "tests", 114 "symfony-tests-dir": "tests",
118 "symfony-assets-install": "relative", 115 "symfony-assets-install": "relative",
119 "incenteev-parameters": { 116 "incenteev-parameters": {
120 "file": "app/config/parameters.yml", 117 "file": "app/config/parameters.yml"
121 "env-map": {
122 "mailer_host": "WALLABAG_MAILER_HOST",
123 "mailer_user": "WALLABAG_MAILER_USER",
124 "mailer_password": "WALLABAG_MAILER_PASSWORD",
125 "secret": "WALLABAG_SECRET"
126 }
127 } 118 }
128 }, 119 },
129 "autoload": { 120 "autoload": {