diff options
-rw-r--r-- | composer.json | 13 | ||||
-rw-r--r-- | docs/en/user/installation.rst | 5 | ||||
-rw-r--r-- | docs/fr/user/installation.rst | 5 |
3 files changed, 12 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": { |
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index bc35a02b..586b01ad 100644 --- 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 | |||
62 | 62 | ||
63 | And access wallabag at http://yourserverip:8000 | 63 | And access wallabag at http://yourserverip:8000 |
64 | 64 | ||
65 | .. note:: | ||
66 | |||
67 | 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 | ||
68 | <http://symfony.com/doc/current/cookbook/configuration/external_parameters.html>`__. | ||
69 | |||
65 | Installing on Apache | 70 | Installing on Apache |
66 | -------------------- | 71 | -------------------- |
67 | 72 | ||
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index 489304d6..53cc4adf 100644 --- 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 | |||
60 | 60 | ||
61 | Et accéder wallabag à l'adresse http://lipdevotreserveur:8000 | 61 | Et accéder wallabag à l'adresse http://lipdevotreserveur:8000 |
62 | 62 | ||
63 | .. note:: | ||
64 | |||
65 | 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 | ||
66 | <http://symfony.com/doc/current/cookbook/configuration/external_parameters.html>`__ pour en savoir plus. | ||
67 | |||
63 | Installation avec Apache | 68 | Installation avec Apache |
64 | ------------------------ | 69 | ------------------------ |
65 | 70 | ||