Merge branch 'postgresql'

9 files changed, 28 insertions, 10 deletions

diff --git a/config/default.yaml b/config/default.yaml
index 90f4b9466..0939ae4ba 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -8,8 +8,10 @@ webserver:
 
 database:
   hostname: 'localhost'
-  port: 27017
-  suffix: '-dev'
+  port: 5432
+  suffix: '_dev'
+  username: 'peertube'
+  password: 'peertube'
 
 # From the project root directory
 storage:
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 056ace434..005444e73 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -1,3 +1,6 @@
+listen:
+  port: 9000
+
 # Correspond to your reverse proxy "listen" configuration
 webserver:
   https: false
@@ -5,4 +8,17 @@ webserver:
   port: 80
 
 database:
-  suffix: '-prod'
+  hostname: 'localhost'
+  port: 5432
+  suffix: '_prod'
+  username: peertube
+  password: peertube
+
+# From the project root directory
+storage:
+  certs: 'certs/'
+  videos: 'videos/'
+  logs: 'logs/'
+  previews: 'previews/'
+  thumbnails: 'thumbnails/'
+  torrents: 'torrents/'
diff --git a/config/test-1.yaml b/config/test-1.yaml
index 6dcc7f294..b2a0a5422 100644
--- a/config/test-1.yaml
+++ b/config/test-1.yaml
@@ -6,7 +6,7 @@ webserver:
   port: 9001
 
 database:
-  suffix: '-test1'
+  suffix: '_test1'
 
 # From the project root directory
 storage:
diff --git a/config/test-2.yaml b/config/test-2.yaml
index 209525963..7285f3394 100644
--- a/config/test-2.yaml
+++ b/config/test-2.yaml
@@ -6,7 +6,7 @@ webserver:
   port: 9002
 
 database:
-  suffix: '-test2'
+  suffix: '_test2'
 
 # From the project root directory
 storage:
diff --git a/config/test-3.yaml b/config/test-3.yaml
index 15719d107..138a2cd53 100644
--- a/config/test-3.yaml
+++ b/config/test-3.yaml
@@ -6,7 +6,7 @@ webserver:
   port: 9003
 
 database:
-  suffix: '-test3'
+  suffix: '_test3'
 
 # From the project root directory
 storage:
diff --git a/config/test-4.yaml b/config/test-4.yaml
index e6f34d013..7425f4af7 100644
--- a/config/test-4.yaml
+++ b/config/test-4.yaml
@@ -6,7 +6,7 @@ webserver:
   port: 9004
 
 database:
-  suffix: '-test4'
+  suffix: '_test4'
 
 # From the project root directory
 storage:
diff --git a/config/test-5.yaml b/config/test-5.yaml
index fdeec76d4..1bf0de658 100644
--- a/config/test-5.yaml
+++ b/config/test-5.yaml
@@ -6,7 +6,7 @@ webserver:
   port: 9005
 
 database:
-  suffix: '-test5'
+  suffix: '_test5'
 
 # From the project root directory
 storage:
diff --git a/config/test-6.yaml b/config/test-6.yaml
index 0c9630c89..7303a08fc 100644
--- a/config/test-6.yaml
+++ b/config/test-6.yaml
@@ -6,7 +6,7 @@ webserver:
   port: 9006
 
 database:
-  suffix: '-test6'
+  suffix: '_test6'
 
 # From the project root directory
 storage:
diff --git a/config/test.yaml b/config/test.yaml
index 06705a987..493a23076 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -6,4 +6,4 @@ webserver:
 
 database:
   hostname: 'localhost'
-  port: 27017
+  port: 5432