# HG changeset patch # User Luke Hoersten # Date 1592322899 18000 # Node ID 5afa8c28e689e2b7be103b1a4c04b3ab439a6db4 # Parent bce4a3fd8da80246bc0633f6e4f2f7a698b6eb40 Updated for better nginx usage. diff -r bce4a3fd8da8 -r 5afa8c28e689 pleroma-otp/templates/pleroma.cloudflare.index.nginx.conf.j2 --- a/pleroma-otp/templates/pleroma.cloudflare.index.nginx.conf.j2 Sun Jun 14 09:36:33 2020 -0500 +++ b/pleroma-otp/templates/pleroma.cloudflare.index.nginx.conf.j2 Tue Jun 16 10:54:59 2020 -0500 @@ -10,8 +10,7 @@ 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 @@ 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 -r bce4a3fd8da8 -r 5afa8c28e689 pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2 --- a/pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2 Sun Jun 14 09:36:33 2020 -0500 +++ b/pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2 Tue Jun 16 10:54:59 2020 -0500 @@ -10,8 +10,7 @@ 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 @@ 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 -r bce4a3fd8da8 -r 5afa8c28e689 pleroma-otp/templates/pleroma.letsencrypt.nginx.conf.j2 --- a/pleroma-otp/templates/pleroma.letsencrypt.nginx.conf.j2 Sun Jun 14 09:36:33 2020 -0500 +++ b/pleroma-otp/templates/pleroma.letsencrypt.nginx.conf.j2 Tue Jun 16 10:54:59 2020 -0500 @@ -10,8 +10,7 @@ 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 @@ 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}};