diff options
3 files changed, 6 insertions, 12 deletions
diff --git a/pleroma-otp/templates/pleroma.cloudflare.index.nginx.conf.j2 b/pleroma-otp/templates/pleroma.cloudflare.index.nginx.conf.j2 index 0594f81..20ccc78 100644 --- a/pleroma-otp/templates/pleroma.cloudflare.index.nginx.conf.j2 +++ b/pleroma-otp/templates/pleroma.cloudflare.index.nginx.conf.j2 @@ -10,8 +10,7 @@ proxy_cache_path /tmp/{{pleroma_instance}}-pleroma-media-cache levels=1:2 keys_z inactive=720m use_temp_path=off; server { - listen {{nginx_port}}; - # listen [::]:{{nginx_port}}; + listen 80; server_name {{nginx_server_name}}; return 301 https://$host$request_uri; } @@ -20,8 +19,7 @@ server { ssl_session_cache shared:ssl_session_cache:10m; server { - listen {{nginx_ssl_port}} ssl http2; - # listen [::]:{{nginx_ssl_port}} ssl ipv6only=on; + listen 443 ssl http2; server_name {{nginx_server_name}}; ssl_certificate {{nginx_ssl_cert}}; diff --git a/pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2 b/pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2 index 5c69a5c..e64b00c 100644 --- a/pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2 +++ b/pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2 @@ -10,8 +10,7 @@ proxy_cache_path /tmp/{{pleroma_instance}}-pleroma-media-cache levels=1:2 keys_z inactive=720m use_temp_path=off; server { - listen {{nginx_port}}; - # listen [::]:{{nginx_port}}; + listen 80; server_name {{nginx_server_name}}; return 301 https://$host$request_uri; } @@ -20,8 +19,7 @@ server { ssl_session_cache shared:ssl_session_cache:10m; server { - listen {{nginx_ssl_port}} ssl http2; - # listen [::]:{{nginx_ssl_port}} ssl ipv6only=on; + listen 443 ssl http2; server_name {{nginx_server_name}}; ssl_certificate {{nginx_ssl_cert}}; diff --git a/pleroma-otp/templates/pleroma.letsencrypt.nginx.conf.j2 b/pleroma-otp/templates/pleroma.letsencrypt.nginx.conf.j2 index af066ea..5a43748 100644 --- a/pleroma-otp/templates/pleroma.letsencrypt.nginx.conf.j2 +++ b/pleroma-otp/templates/pleroma.letsencrypt.nginx.conf.j2 @@ -10,8 +10,7 @@ proxy_cache_path /tmp/{{pleroma_instance}}-pleroma-media-cache levels=1:2 keys_z inactive=720m use_temp_path=off; server { - listen {{nginx_port}}; - # listen [::]:{{nginx_port}}; + listen 80; server_name {{nginx_server_name}}; return 301 https://$host$request_uri; } @@ -20,8 +19,7 @@ server { ssl_session_cache shared:ssl_session_cache:10m; server { - listen {{nginx_ssl_port}} ssl http2; - # listen [::]:{{nginx_ssl_port}} ssl ipv6only=on; + listen 443 ssl http2; server_name {{nginx_server_name}}; ssl_certificate {{nginx_ssl_cert}}; |