diff options
| author | Chocobozzz <me@florianbigard.com> | 2023-01-09 09:44:00 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2023-01-09 09:44:00 +0100 |
| commit | 0a8a79552cf59c800011c9f63eaa8658230acddc (patch) | |
| tree | e797870a2660ca342722eaea426ed8a588a640b9 /config | |
| parent | cde3d90ded5debb24281a444eabb720b721e5600 (diff) | |
| parent | 2570fd9c1c879d1a543fb0dff1e7cfb036234d11 (diff) | |
| download | PeerTube-0a8a79552cf59c800011c9f63eaa8658230acddc.tar.gz PeerTube-0a8a79552cf59c800011c9f63eaa8658230acddc.tar.zst PeerTube-0a8a79552cf59c800011c9f63eaa8658230acddc.zip | |
Merge branch 'feature/SO035' into develop
Diffstat (limited to 'config')
| -rw-r--r-- | config/default.yaml | 5 | ||||
| -rw-r--r-- | config/production.yaml.example | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml index 1b7c3314d..d4977d003 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
| @@ -37,6 +37,11 @@ rates_limit: | |||
| 37 | window: 10 minutes | 37 | window: 10 minutes |
| 38 | max: 10 | 38 | max: 10 |
| 39 | 39 | ||
| 40 | oauth2: | ||
| 41 | token_lifetime: | ||
| 42 | access_token: '1 day' | ||
| 43 | refresh_token: '2 weeks' | ||
| 44 | |||
| 40 | # Proxies to trust to get real client IP | 45 | # Proxies to trust to get real client IP |
| 41 | # If you run PeerTube just behind a local proxy (nginx), keep 'loopback' | 46 | # If you run PeerTube just behind a local proxy (nginx), keep 'loopback' |
| 42 | # If you run PeerTube behind a remote proxy, add the proxy IP address (or subnet) | 47 | # If you run PeerTube behind a remote proxy, add the proxy IP address (or subnet) |
diff --git a/config/production.yaml.example b/config/production.yaml.example index da067b3b5..17dc6839b 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
| @@ -35,6 +35,11 @@ rates_limit: | |||
| 35 | window: 10 minutes | 35 | window: 10 minutes |
| 36 | max: 10 | 36 | max: 10 |
| 37 | 37 | ||
| 38 | oauth2: | ||
| 39 | token_lifetime: | ||
| 40 | access_token: '1 day' | ||
| 41 | refresh_token: '2 weeks' | ||
| 42 | |||
| 38 | # Proxies to trust to get real client IP | 43 | # Proxies to trust to get real client IP |
| 39 | # If you run PeerTube just behind a local proxy (nginx), keep 'loopback' | 44 | # If you run PeerTube just behind a local proxy (nginx), keep 'loopback' |
| 40 | # If you run PeerTube behind a remote proxy, add the proxy IP address (or subnet) | 45 | # If you run PeerTube behind a remote proxy, add the proxy IP address (or subnet) |