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

diff --git a/.gitignore b/.gitignore
index ec9db08ff0a8d6dbafcf9e4be0cf3d5055eece4a..9a473268af5933264761b1469d0629b9da81c9b6 100644 (file)
--- 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 1aa6108cc18d3e97c3b755cfab28eb583189792d..f2632084c3c417f8eae67a5233fb0d96053fd06a 100644 (file)
--- 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