aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-10-10 11:19:58 +0200
committerChocobozzz <me@florianbigard.com>2022-10-10 11:19:58 +0200
commit63fa260a81a8930c157b73c897fe8696a8cc90d4 (patch)
tree705ebfae42f9c59b2a1ac97779e4037102dfed1c /config
parent9b99d32804e99462c6f22df3ec3db9ec5bf8a18c (diff)
parent1ea868a9456439108fbd87255537093ed8bd456f (diff)
downloadPeerTube-63fa260a81a8930c157b73c897fe8696a8cc90d4.tar.gz
PeerTube-63fa260a81a8930c157b73c897fe8696a8cc90d4.tar.zst
PeerTube-63fa260a81a8930c157b73c897fe8696a8cc90d4.zip
Merge branch 'feature/otp' into develop
Diffstat (limited to 'config')
-rw-r--r--config/default.yaml5
-rw-r--r--config/dev.yaml3
-rw-r--r--config/production.yaml.example5
-rw-r--r--config/test.yaml3
4 files changed, 16 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml
index 2d8aaf1ea..f94ec6209 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -10,6 +10,11 @@ webserver:
10 hostname: 'localhost' 10 hostname: 'localhost'
11 port: 9000 11 port: 9000
12 12
13# Secrets you need to generate the first time you run PeerTube
14secrets:
15 # Generate one using `openssl rand -hex 32`
16 peertube: ''
17
13rates_limit: 18rates_limit:
14 api: 19 api:
15 # 50 attempts in 10 seconds 20 # 50 attempts in 10 seconds
diff --git a/config/dev.yaml b/config/dev.yaml
index ca93874d2..ef93afc19 100644
--- a/config/dev.yaml
+++ b/config/dev.yaml
@@ -5,6 +5,9 @@ listen:
5webserver: 5webserver:
6 https: false 6 https: false
7 7
8secrets:
9 peertube: 'my super dev secret'
10
8database: 11database:
9 hostname: 'localhost' 12 hostname: 'localhost'
10 port: 5432 13 port: 5432
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 46d574e42..e37ff9b8a 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -8,6 +8,11 @@ webserver:
8 hostname: 'example.com' 8 hostname: 'example.com'
9 port: 443 9 port: 443
10 10
11# Secrets you need to generate the first time you run PeerTube
12secret:
13 # Generate one using `openssl rand -hex 32`
14 peertube: ''
15
11rates_limit: 16rates_limit:
12 api: 17 api:
13 # 50 attempts in 10 seconds 18 # 50 attempts in 10 seconds
diff --git a/config/test.yaml b/config/test.yaml
index a87642bd8..48cf0c0f6 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -5,6 +5,9 @@ listen:
5webserver: 5webserver:
6 https: false 6 https: false
7 7
8secrets:
9 peertube: 'my super secret'
10
8rates_limit: 11rates_limit:
9 signup: 12 signup:
10 window: 10 minutes 13 window: 10 minutes