diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-02-26 06:56:29 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-02-26 06:56:29 +0000 |
| commit | 03afee3fd11116d7deef256bd2b0de22526ff5b5 (patch) | |
| tree | 426d64055f563f5033b06e303958e1726a460ce7 /installation | |
| parent | 2ed7003c26c68cb8c1b2061435df17430287f243 (diff) | |
| parent | d3a6c065a496c3a7c4f0604af646b6fb611f585b (diff) | |
| download | pleroma-03afee3fd11116d7deef256bd2b0de22526ff5b5.tar.gz pleroma-03afee3fd11116d7deef256bd2b0de22526ff5b5.zip | |
Merge branch 'nginx-cfg' into 'develop'
Add ipv6 handling to pleroma.nginx
See merge request pleroma/pleroma!865
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/pleroma.nginx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx index a3d55e4bf..66a0e987c 100644 --- a/installation/pleroma.nginx +++ b/installation/pleroma.nginx @@ -11,7 +11,7 @@ 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; # Uncomment this if you need to use the 'webroot' method with certbot. Make sure @@ -29,7 +29,7 @@ server { ssl_session_cache shared:ssl_session_cache:10m; server { - listen 443 ssl http2; + listen [::]:443 ssl http2; ssl_session_timeout 5m; ssl_trusted_certificate /etc/letsencrypt/live/example.tld/fullchain.pem; |