aboutsummaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authoryalh76 <yalh@yahoo.com>2020-02-26 19:32:42 +0100
committerGitHub <noreply@github.com>2020-02-26 19:32:42 +0100
commit53aeae382eda1263d0ebf9a454bd1c3eeca8ddb1 (patch)
tree4863f9656e46cbf77b2dcde17160fe3e477d77c8 /conf
parentdf1d3b83108d43e898b99e26adbeea32d8961b69 (diff)
parent2b588c79f4c1a28f0ffe25781a68673abe69434c (diff)
downloadmastodon_ynh-53aeae382eda1263d0ebf9a454bd1c3eeca8ddb1.tar.gz
mastodon_ynh-53aeae382eda1263d0ebf9a454bd1c3eeca8ddb1.tar.bz2
mastodon_ynh-53aeae382eda1263d0ebf9a454bd1c3eeca8ddb1.zip
Merge pull request #195 from YunoHost-Apps/testing
Apply example_ynh
Diffstat (limited to 'conf')
-rw-r--r--conf/message2
-rw-r--r--conf/nginx.conf96
2 files changed, 49 insertions, 49 deletions
diff --git a/conf/message b/conf/message
index 488d86d..403c4e0 100644
--- a/conf/message
+++ b/conf/message
@@ -1,5 +1,5 @@
Mastodon was successfully installed :)
-Please open 'https://__DOMAIN____PATH_URL__'
+Please open : https://__DOMAIN____PATH_URL__
The admin email is: __ADMIN_MAIL__
The admin password is: __ADMIN_PASS__
If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/mastodon_ynh \ No newline at end of file
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 190c650..7fa7b87 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -6,70 +6,70 @@ root __FINALPATH__/live/public;
location / {
- if ($scheme = http) {
- rewrite ^ https://$server_name$request_uri? permanent;
- }
+ # Force usage of https
+ if ($scheme = http) {
+ rewrite ^ https://$server_name$request_uri? permanent;
+ }
- proxy_set_header Accept-Encoding "";
- try_files $uri @proxy;
+ proxy_set_header Accept-Encoding "";
+ try_files $uri @proxy;
- # Include SSOWAT user panel.
- include conf.d/yunohost_panel.conf.inc;
+ # Include SSOWAT user panel.
+ include conf.d/yunohost_panel.conf.inc;
}
location ~ ^/(emoji|packs|system/accounts/avatars|system/media_attachments/files) {
- add_header Cache-Control "public, max-age=31536000, immutable";
- add_header Strict-Transport-Security "max-age=31536000";
- try_files $uri @proxy;
+ add_header Cache-Control "public, max-age=31536000, immutable";
+ add_header Strict-Transport-Security "max-age=31536000";
+ try_files $uri @proxy;
}
location /sw.js {
- add_header Cache-Control "public, max-age=0";
- add_header Strict-Transport-Security "max-age=31536000";
- try_files $uri @proxy;
+ add_header Cache-Control "public, max-age=0";
+ add_header Strict-Transport-Security "max-age=31536000";
+ try_files $uri @proxy;
}
location @proxy {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto https;
- proxy_set_header Proxy "";
- proxy_pass_header Server;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto https;
+ proxy_set_header Proxy "";
+ proxy_pass_header Server;
- proxy_pass http://127.0.0.1:3000;
- proxy_buffering on;
- proxy_redirect off;
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection "upgrade";
+ proxy_pass http://127.0.0.1:3000;
+ proxy_buffering on;
+ proxy_redirect off;
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection "upgrade";
- #proxy_cache CACHE;
- proxy_cache_valid 200 7d;
- proxy_cache_valid 410 24h;
- proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
- add_header X-Cached $upstream_cache_status;
- add_header Strict-Transport-Security "max-age=31536000";
+ #proxy_cache CACHE;
+ proxy_cache_valid 200 7d;
+ proxy_cache_valid 410 24h;
+ proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
+ add_header X-Cached $upstream_cache_status;
+ add_header Strict-Transport-Security "max-age=31536000";
- tcp_nodelay on;
+ tcp_nodelay on;
}
location /api/v1/streaming {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto https;
- proxy_set_header Proxy "";
-
- proxy_pass http://127.0.0.1:4000;
- proxy_buffering off;
- proxy_redirect off;
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection "upgrade";
-
- tcp_nodelay on;
-}
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto https;
+ proxy_set_header Proxy "";
+
+ proxy_pass http://127.0.0.1:4000;
+ proxy_buffering off;
+ proxy_redirect off;
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection "upgrade";
+ tcp_nodelay on;
+}
-error_page 500 501 502 503 504 /500.html; \ No newline at end of file
+error_page 500 501 502 503 504 /500.html;