aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authordada <dada@dadall.info>2016-10-26 19:15:49 +0200
committerdada <dada@dadall.info>2016-10-26 19:15:49 +0200
commit9da2ec0de65d5c0d13ef658430665bf9c887aa9d (patch)
treed521c4e432ecae0855021eee04aa17f369904770
parent2ace56f8c3e0dd586cba419c38ac5c40372a8b22 (diff)
downloadPeerTube-9da2ec0de65d5c0d13ef658430665bf9c887aa9d.tar.gz
PeerTube-9da2ec0de65d5c0d13ef658430665bf9c887aa9d.tar.zst
PeerTube-9da2ec0de65d5c0d13ef658430665bf9c887aa9d.zip
Timeout / rm diaspote ref
-rw-r--r--support/apache/peertube.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/support/apache/peertube.conf b/support/apache/peertube.conf
index 0ccd86069..9265fbda6 100644
--- a/support/apache/peertube.conf
+++ b/support/apache/peertube.conf
@@ -1,13 +1,13 @@
1 <VirtualHost *:80> 1 <VirtualHost *:80>
2 ServerName peertube.example.org 2 ServerName peertube.example.org
3 3
4 CustomLog /var/log/apache2/peertube/diaspote-access.log combined 4 CustomLog /var/log/apache2/peertube/perrtube-access.log combined
5 ErrorLog /var/log/apache2/peertube/diaspote-error.log 5 ErrorLog /var/log/apache2/peertube/peertube-error.log
6 6
7 ProxyRequests Off 7 ProxyRequests Off
8 ProxyPreserveHost On 8 ProxyPreserveHost On
9 9
10 Timeout 300 10 Timeout 900
11 11
12 Header set Access-Control-Allow-Origin "*" 12 Header set Access-Control-Allow-Origin "*"
13 Header set Access-Control-Allow-Headers "x-requested-with, Content-Type, origin, authorization, accept, client-security-token, range" 13 Header set Access-Control-Allow-Headers "x-requested-with, Content-Type, origin, authorization, accept, client-security-token, range"