From 2ace56f8c3e0dd586cba419c38ac5c40372a8b22 Mon Sep 17 00:00:00 2001
From: dada <dada@dadall.info>
Date: Wed, 26 Oct 2016 18:46:11 +0200
Subject: [PATCH 1/2] Apache configuration

---
 support/apache/peertube.conf | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 support/apache/peertube.conf

diff --git a/support/apache/peertube.conf b/support/apache/peertube.conf
new file mode 100644
index 000000000..0ccd86069
--- /dev/null
+++ b/support/apache/peertube.conf
@@ -0,0 +1,26 @@
+ <VirtualHost *:80>
+        ServerName peertube.example.org
+
+        CustomLog /var/log/apache2/peertube/diaspote-access.log combined
+        ErrorLog /var/log/apache2/peertube/diaspote-error.log
+
+        ProxyRequests Off
+        ProxyPreserveHost On
+
+        Timeout 300
+
+        Header set Access-Control-Allow-Origin "*"
+        Header set Access-Control-Allow-Headers "x-requested-with, Content-Type, origin, authorization, accept, client-security-token, range"
+        Header set Access-Control-Allow-Methods "POST, GET, OPTIONS"
+
+        ProxyPass /tracker/socket "ws://localhost:9000/tracker/socket"
+        ProxyPassReverse /tracker/socket "ws://localhost:9000/tracker/socket"
+
+        ProxyPass / http://localhost:9000/
+        ProxyPassReverse / http://localhost:9000/
+
+        ProxyTimeout 1200
+
+ </VirtualHost>
+
+

From 9da2ec0de65d5c0d13ef658430665bf9c887aa9d Mon Sep 17 00:00:00 2001
From: dada <dada@dadall.info>
Date: Wed, 26 Oct 2016 19:15:49 +0200
Subject: [PATCH 2/2] Timeout / rm diaspote ref

---
 support/apache/peertube.conf | 6 +++---
 1 file 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 @@
  <VirtualHost *:80>
         ServerName peertube.example.org
 
-        CustomLog /var/log/apache2/peertube/diaspote-access.log combined
-        ErrorLog /var/log/apache2/peertube/diaspote-error.log
+        CustomLog /var/log/apache2/peertube/perrtube-access.log combined
+        ErrorLog /var/log/apache2/peertube/peertube-error.log
 
         ProxyRequests Off
         ProxyPreserveHost On
 
-        Timeout 300
+        Timeout 900
 
         Header set Access-Control-Allow-Origin "*"
         Header set Access-Control-Allow-Headers "x-requested-with, Content-Type, origin, authorization, accept, client-security-token, range"