projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/959-emoji-loading' into 'develop'
[akkoma]
/
installation
/
pleroma.nginx
diff --git
a/installation/pleroma.nginx
b/installation/pleroma.nginx
index a3d55e4bff785db6bb9a8b88c5e4af67f1f553e3..7425da33f0d1879d7c3b84a5a5154050d0d5e0e8 100644
(file)
--- a/
installation/pleroma.nginx
+++ b/
installation/pleroma.nginx
@@
-11,7
+11,9
@@
proxy_cache_path /tmp/pleroma-media-cache levels=1:2 keys_zone=pleroma_media_cac
server {
server_name example.tld;
server {
server_name example.tld;
+
listen 80;
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
return 301 https://$server_name$request_uri;
# Uncomment this if you need to use the 'webroot' method with certbot. Make sure
@@
-29,10
+31,13
@@
server {
ssl_session_cache shared:ssl_session_cache:10m;
server {
ssl_session_cache shared:ssl_session_cache:10m;
server {
+ server_name example.tld;
+
listen 443 ssl http2;
listen 443 ssl http2;
+ listen [::]:443 ssl http2;
ssl_session_timeout 5m;
ssl_session_timeout 5m;
- ssl_trusted_certificate /etc/letsencrypt/live/example.tld/
full
chain.pem;
+ ssl_trusted_certificate /etc/letsencrypt/live/example.tld/chain.pem;
ssl_certificate /etc/letsencrypt/live/example.tld/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/example.tld/privkey.pem;
ssl_certificate /etc/letsencrypt/live/example.tld/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/example.tld/privkey.pem;
@@
-48,8
+53,6
@@
server {
ssl_stapling on;
ssl_stapling_verify on;
ssl_stapling on;
ssl_stapling_verify on;
- server_name example.tld;
-
gzip_vary on;
gzip_proxied any;
gzip_comp_level 6;
gzip_vary on;
gzip_proxied any;
gzip_comp_level 6;
@@
-66,7
+69,9
@@
server {
proxy_set_header Connection "upgrade";
proxy_set_header Host $http_host;
proxy_set_header Connection "upgrade";
proxy_set_header Host $http_host;
- proxy_pass http://localhost:4000;
+ # this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only
+ # and `localhost.` resolves to [::0] on some systems: see issue #930
+ proxy_pass http://127.0.0.1:4000;
client_max_body_size 16m;
}
client_max_body_size 16m;
}