diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-11-23 09:53:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 09:53:18 +0100 |
| commit | f4a98334903f01e6109b09e27dc1ebefab8f8865 (patch) | |
| tree | 91bc4aaa5bbebb141911477113d28ab00973603f /app/config | |
| parent | 75a4b3b23fcc183d926eb7cc782762085661b2da (diff) | |
| parent | fcbf253b6bc0772adaf0d0e7cc51de50046cf64e (diff) | |
| download | wallabag-f4a98334903f01e6109b09e27dc1ebefab8f8865.tar.gz wallabag-f4a98334903f01e6109b09e27dc1ebefab8f8865.tar.zst wallabag-f4a98334903f01e6109b09e27dc1ebefab8f8865.zip | |
Merge pull request #2620 from wallabag/fix-password-layout
Fix password layout
Diffstat (limited to 'app/config')
| -rw-r--r-- | app/config/config.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 487e934b..5f939ab5 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
| @@ -210,6 +210,7 @@ fos_user: | |||
| 210 | from_email: | 210 | from_email: |
| 211 | address: "%from_email%" | 211 | address: "%from_email%" |
| 212 | sender_name: wallabag | 212 | sender_name: wallabag |
| 213 | |||
| 213 | fos_oauth_server: | 214 | fos_oauth_server: |
| 214 | db_driver: orm | 215 | db_driver: orm |
| 215 | client_class: Wallabag\ApiBundle\Entity\Client | 216 | client_class: Wallabag\ApiBundle\Entity\Client |
| @@ -217,10 +218,10 @@ fos_oauth_server: | |||
| 217 | refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken | 218 | refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken |
| 218 | auth_code_class: Wallabag\ApiBundle\Entity\AuthCode | 219 | auth_code_class: Wallabag\ApiBundle\Entity\AuthCode |
| 219 | service: | 220 | service: |
| 220 | user_provider: fos_user.user_manager | 221 | user_provider: fos_user.user_provider.username_email |
| 221 | options: | 222 | options: |
| 222 | refresh_token_lifetime: 1209600 | 223 | refresh_token_lifetime: 1209600 |
| 223 | 224 | ||
| 224 | scheb_two_factor: | 225 | scheb_two_factor: |
| 225 | trusted_computer: | 226 | trusted_computer: |
| 226 | enabled: true | 227 | enabled: true |