diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-05-27 16:12:41 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-05-27 16:12:41 +0200 |
| commit | 8f608a4cb22ab232cfab20665050764b38bac9c7 (patch) | |
| tree | 6a6785aae79bf5939ad7b7a50a1bd8031268d2b4 /config | |
| parent | 030ccfce59a8cb8f2fee6ea8dd363ba635c5c5c2 (diff) | |
| parent | c215e627b575d2c4085ccb222f4ca8d0237b7552 (diff) | |
| download | PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.tar.gz PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.tar.zst PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.zip | |
Merge branch 'develop' into shorter-URLs-channels-accounts
Diffstat (limited to 'config')
| -rw-r--r-- | config/default.yaml | 2 | ||||
| -rw-r--r-- | config/production.yaml.example | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/default.yaml b/config/default.yaml index 281cc0577..9b90bacfc 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
| @@ -96,7 +96,7 @@ storage: | |||
| 96 | client_overrides: 'storage/client-overrides/' | 96 | client_overrides: 'storage/client-overrides/' |
| 97 | 97 | ||
| 98 | log: | 98 | log: |
| 99 | level: 'info' # debug/info/warning/error | 99 | level: 'info' # 'debug' | 'info' | 'warn' | 'error' |
| 100 | rotation: | 100 | rotation: |
| 101 | enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate | 101 | enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate |
| 102 | maxFileSize: 12MB | 102 | maxFileSize: 12MB |
diff --git a/config/production.yaml.example b/config/production.yaml.example index fed6b45ca..47ef47279 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
| @@ -94,7 +94,7 @@ storage: | |||
| 94 | client_overrides: '/var/www/peertube/storage/client-overrides/' | 94 | client_overrides: '/var/www/peertube/storage/client-overrides/' |
| 95 | 95 | ||
| 96 | log: | 96 | log: |
| 97 | level: 'info' # debug/info/warning/error | 97 | level: 'info' # 'debug' | 'info' | 'warn' | 'error' |
| 98 | rotation: | 98 | rotation: |
| 99 | enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate | 99 | enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate |
| 100 | maxFileSize: 12MB | 100 | maxFileSize: 12MB |