aboutsummaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authornemsia <nemsia@nemsia.org>2017-05-28 17:16:45 +0200
committernemsia <nemsia@nemsia.org>2017-05-28 17:16:45 +0200
commit890b3f2328643801cf6d46fdb8ffc129739490f7 (patch)
tree0e31c6837f5815cee1e4752d8ab6ad59efa28b46 /conf
parentdc0d11084c85d5251474f5a971b16760b857d6a3 (diff)
parent097bd9dec81c64fe8830a8fe7863451056e13def (diff)
downloadmastodon_ynh-890b3f2328643801cf6d46fdb8ffc129739490f7.tar.gz
mastodon_ynh-890b3f2328643801cf6d46fdb8ffc129739490f7.tar.bz2
mastodon_ynh-890b3f2328643801cf6d46fdb8ffc129739490f7.zip
Merge remote-tracking branch 'refs/remotes/YunoHost-Apps/master'
Diffstat (limited to 'conf')
-rw-r--r--conf/nginx.conf9
1 files changed, 9 insertions, 0 deletions
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 0d48dc5..85f883c 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,6 +1,9 @@
# upload max size
client_max_body_size 100M;
+# add to v1.4 assets
+root /opt/mastodon/live/public;
+
location / {
if ($scheme = http) {
@@ -13,6 +16,12 @@ location / {
include conf.d/yunohost_panel.conf.inc;
}
+# add to v1.4 assets
+location ~ ^/(assets|system/media_attachments/files|system/accounts/avatars) {
+ add_header Cache-Control "public, max-age=31536000, immutable";
+ try_files $uri @proxy;
+ }
+
location @proxy {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;