Merge branch 'master' into develop

[github/Chocobozzz/PeerTube.git] / support / docker / production / config / custom-environment-variables.yaml

diff --git a/support/docker/production/config/custom-environment-variables.yaml b/support/docker/production/config/custom-environment-variables.yaml
index 1f7fbf849e36ed62d1097ea4064102635399e637..bd4ac121555f6b6938b48bba534bd814cb19b7b7 100644 (file)
--- a/support/docker/production/config/custom-environment-variables.yaml
+++ b/support/docker/production/config/custom-environment-variables.yaml
@@ -7,7 +7,9 @@ webserver:
     __name: "PEERTUBE_WEBSERVER_HTTPS"
     __format: "json"
 
-trust_proxy: "PEERTUBE_TRUST_PROXY"
+trust_proxy:
+  __name: "PEERTUBE_TRUST_PROXY"
+  __format: "json"
 
 database:
   hostname: "PEERTUBE_DB_HOSTNAME"
@@ -48,6 +50,11 @@ user:
 admin:
   email: "PEERTUBE_ADMIN_EMAIL"
 
+contact_form:
+  enabled:
+    __name: "PEERTUBE_CONTACT_FORM_ENABLED"
+    __format: "json"
+
 signup:
   enabled:
     __name: "PEERTUBE_SIGNUP_ENABLED"
@@ -99,7 +106,6 @@ transcoding:
     1080:
       __name: "PEERTUBE_TRANSCODING_1080P"
       __format: "json"
-    
 
 instance:
   name: "PEERTUBE_INSTANCE_NAME"