Merge pull request #1824 from wallabag/v2-alternative-env

Remove SMTP configuration environment overrides

diff --git a/composer.json b/composer.json
index aa120970fe074154a249abe1e8f011f5956f1adc..7dbc6772d41f9839faf46153cc4ef24a4b33a5c2 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -91,11 +91,8 @@
         "fabpot/php-cs-fixer": "~1.9"
     },
     "scripts": {
-        "build-parameters": [
-            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
-        ],
         "post-cmd": [
-            "@build-parameters",
+            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
@@ -117,13 +114,7 @@
         "symfony-tests-dir": "tests",
         "symfony-assets-install": "relative",
         "incenteev-parameters": {
-            "file": "app/config/parameters.yml",
-            "env-map": {
-                "mailer_host": "WALLABAG_MAILER_HOST",
-                "mailer_user": "WALLABAG_MAILER_USER",
-                "mailer_password": "WALLABAG_MAILER_PASSWORD",
-                "secret": "WALLABAG_SECRET"
-            }
+            "file": "app/config/parameters.yml"
         }
     },
     "autoload": {

diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index bc35a02b41f5d26a1491ddb38d766c95d357c83c..586b01ad54be9bf86c600f22842a3d3783d6b290 100644 (file)
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -62,6 +62,11 @@ To start php's build-in server and test if everything did install correctly, you
 
 And access wallabag at http://yourserverip:8000
 
+.. note::
+
+    To define parameters with environment variables, you have to set these variables with ``SYMFONY__`` prefix. For example, ``SYMFONY__DATABASE_DRIVER``. You can have a look to the  `Symfony documentation
+<http://symfony.com/doc/current/cookbook/configuration/external_parameters.html>`__.
+
 Installing on Apache
 --------------------
 

diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index 489304d647eada7ef49c6ed65ed5a309fe7d41c5..53cc4adfed62d9a947a7736ec71a0b97a8ce47fc 100644 (file)
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -60,6 +60,11 @@ Pour démarrer le serveur interne à php et vérifier que tout s'est installé c
 
 Et accéder wallabag à l'adresse http://lipdevotreserveur:8000
 
+.. note::
+
+    Pour définir des paramètres via des variables d'environnement, vous pouvez les spécifier avec le préfixe ``SYMFONY__``. Par exemple, ``SYMFONY__DATABASE_DRIVER``. Vous pouvez lire `documentation Symfony
+<http://symfony.com/doc/current/cookbook/configuration/external_parameters.html>`__ pour en savoir plus. 
+
 Installation avec Apache
 ------------------------