diff options
author | Chocobozzz <me@florianbigard.com> | 2018-03-01 17:14:57 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-03-01 17:14:57 +0100 |
commit | 4919b6304f5b957fddbb37d8d9c6ca5c813b32f6 (patch) | |
tree | 6eec392fd5995be9e857878ab3e7e5764995e4c5 | |
parent | f40411a62e9eab744ff2a4cad9d18b56429a0093 (diff) | |
download | PeerTube-4919b6304f5b957fddbb37d8d9c6ca5c813b32f6.tar.gz PeerTube-4919b6304f5b957fddbb37d8d9c6ca5c813b32f6.tar.zst PeerTube-4919b6304f5b957fddbb37d8d9c6ca5c813b32f6.zip |
Fix nginx configuration that do not work with import-videos script
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | support/nginx/peertube | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index ec9db08ff..9a473268a 100644 --- a/.gitignore +++ b/.gitignore | |||
@@ -21,3 +21,4 @@ | |||
21 | /videos/ | 21 | /videos/ |
22 | /previews/ | 22 | /previews/ |
23 | /logs/ | 23 | /logs/ |
24 | /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 { | |||
26 | ssl_protocols TLSv1.2; # TLSv1.3, TLSv1.2 if nginx >= 1.13.0 | 26 | ssl_protocols TLSv1.2; # TLSv1.3, TLSv1.2 if nginx >= 1.13.0 |
27 | ssl_prefer_server_ciphers on; | 27 | ssl_prefer_server_ciphers on; |
28 | 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'; | 28 | 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'; |
29 | ssl_ecdh_curve secp384r1; # Requires nginx >= 1.1.0 | 29 | # ssl_ecdh_curve secp384r1; # Requires nginx >= 1.1.0, not compatible with import-videos script |
30 | ssl_session_timeout 10m; | 30 | ssl_session_timeout 10m; |
31 | ssl_session_cache shared:SSL:10m; | 31 | ssl_session_cache shared:SSL:10m; |
32 | ssl_session_tickets off; # Requires nginx >= 1.5.9 | 32 | ssl_session_tickets off; # Requires nginx >= 1.5.9 |