diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-21 15:12:11 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-22 21:25:05 +0100 |
| commit | 5066c3e066ad67788bdf6edac9e80cab614a2d4d (patch) | |
| tree | a3e7394f4ff77bc628625dda887286afb9dcf0df /app | |
| parent | 4da598c5df08f8a5e20c838df5de8c9e4efcb273 (diff) | |
| download | wallabag-5066c3e066ad67788bdf6edac9e80cab614a2d4d.tar.gz wallabag-5066c3e066ad67788bdf6edac9e80cab614a2d4d.tar.zst wallabag-5066c3e066ad67788bdf6edac9e80cab614a2d4d.zip | |
Re-use FOSUser master branch
Diffstat (limited to 'app')
| -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 |