diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-06-20 16:40:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-20 16:40:48 +0200 |
commit | 80784b782becfaa297e6d9cbb0584e27739cffc8 (patch) | |
tree | fc201969597b16070d890b0703568618a81a76bc /app/config | |
parent | 604cca1f4247f9f905e57b9276cf2543cfa41a5d (diff) | |
parent | f44dba22fc1a566cb156d9e6eda5afc353163eda (diff) | |
download | wallabag-80784b782becfaa297e6d9cbb0584e27739cffc8.tar.gz wallabag-80784b782becfaa297e6d9cbb0584e27739cffc8.tar.zst wallabag-80784b782becfaa297e6d9cbb0584e27739cffc8.zip |
Merge pull request #2683 from wallabag/credentials-in-db
Store credentials in DB
Diffstat (limited to 'app/config')
-rw-r--r-- | app/config/parameters.yml.dist | 3 | ||||
-rw-r--r-- | app/config/wallabag.yml | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 914fb1ef..b3fe11c8 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -60,6 +60,3 @@ parameters: | |||
60 | redis_port: 6379 | 60 | redis_port: 6379 |
61 | redis_path: null | 61 | redis_path: null |
62 | redis_password: null | 62 | redis_password: null |
63 | |||
64 | # sites credentials | ||
65 | sites_credentials: {} | ||
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 51b7e4e3..b45934e4 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml | |||
@@ -26,6 +26,7 @@ wallabag_core: | |||
26 | fetching_error_message: | | 26 | fetching_error_message: | |
27 | wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. | 27 | wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. |
28 | api_limit_mass_actions: 10 | 28 | api_limit_mass_actions: 10 |
29 | encryption_key_path: "%kernel.root_dir%/../data/site-credentials-secret-key.txt" | ||
29 | default_internal_settings: | 30 | default_internal_settings: |
30 | - | 31 | - |
31 | name: share_public | 32 | name: share_public |