From: Chocobozzz <me@florianbigard.com>
Date: Thu, 1 Mar 2018 16:14:57 +0000 (+0100)
Subject: Fix nginx configuration that do not work with import-videos script
X-Git-Tag: v1.0.0-alpha.2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4919b6304f5b957fddbb37d8d9c6ca5c813b32f6;p=oweals%2Fpeertube.git

Fix nginx configuration that do not work with import-videos script
---

diff --git a/.gitignore b/.gitignore
index ec9db08ff..9a473268a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /videos/
 /previews/
 /logs/
+/server/tools/import-mediacore.ts
diff --git a/support/nginx/peertube b/support/nginx/peertube
index 1aa6108cc..f2632084c 100644
--- a/support/nginx/peertube
+++ b/support/nginx/peertube
@@ -26,7 +26,7 @@ server {
   ssl_protocols TLSv1.2; # TLSv1.3, TLSv1.2 if nginx >= 1.13.0
   ssl_prefer_server_ciphers on;
   ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256';
-  ssl_ecdh_curve secp384r1; # Requires nginx >= 1.1.0
+  # ssl_ecdh_curve secp384r1; # Requires nginx >= 1.1.0, not compatible with import-videos script
   ssl_session_timeout  10m;
   ssl_session_cache shared:SSL:10m;
   ssl_session_tickets off; # Requires nginx >= 1.5.9