commit: 03afee3fd11116d7deef256bd2b0de22526ff5b5
parent: 2ed7003c26c68cb8c1b2061435df17430287f243
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Tue, 26 Feb 2019 06:56:29 +0000
Merge branch 'nginx-cfg' into 'develop'
Add ipv6 handling to pleroma.nginx
See merge request pleroma/pleroma!865
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git 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;