aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-02-26 16:47:18 +0000
committerkaniini <nenolod@gmail.com>2019-02-26 16:47:18 +0000
commitb985c91431cf69d5476fa2cad29a7be0af63186a (patch)
tree57e43271f20bae08fb38a9df7fdcb964a7a3f018
parent03afee3fd11116d7deef256bd2b0de22526ff5b5 (diff)
parente1bdaaa3fe20ad10458afa5edfb161fedcea74c0 (diff)
downloadpleroma-b985c91431cf69d5476fa2cad29a7be0af63186a.tar.gz
Merge branch 'fix-nginx-listen-missing-ipv4' into 'develop'
need to put back ipv4 listen instruct See merge request pleroma/pleroma!866
-rw-r--r--installation/pleroma.nginx7
1 files changed, 5 insertions, 2 deletions
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 66a0e987c..8709f2cb7 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -11,6 +11,8 @@ proxy_cache_path /tmp/pleroma-media-cache levels=1:2 keys_zone=pleroma_media_cac
server {
server_name example.tld;
+
+ listen 80;
listen [::]:80;
return 301 https://$server_name$request_uri;
@@ -29,6 +31,9 @@ server {
ssl_session_cache shared:ssl_session_cache:10m;
server {
+ server_name example.tld;
+
+ listen 443 ssl http2;
listen [::]:443 ssl http2;
ssl_session_timeout 5m;
@@ -48,8 +53,6 @@ server {
ssl_stapling on;
ssl_stapling_verify on;
- server_name example.tld;
-
gzip_vary on;
gzip_proxied any;
gzip_comp_level 6;