Additional

* Implement ynh_systemd_action

* Implement ynh_add_secure_repos__3

4 files changed, 46 insertions, 19 deletions

diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service
index 59f636f..920fcf4 100644
--- a/conf/mastodon-sidekiq.service
+++ b/conf/mastodon-sidekiq.service
@@ -7,8 +7,9 @@
  User=__APP__
  WorkingDirectory=__FINALPATH__/live
  Environment="RAILS_ENV=production"
- Environment="DB_POOL=20"
- ExecStart=/opt/rbenv/versions/2.6.0/bin/bundle exec sidekiq -c 20 -q default -q mailers -q pull -q push
+ Environment="DB_POOL=25"
+ Environment="MALLOC_ARENA_MAX=2"
+ ExecStart=/opt/rbenv/versions/2.6.0/bin/bundle exec sidekiq -c 25
  TimeoutSec=15
  Restart=always
  StandardError=syslog
diff --git a/conf/mastodon-streaming.service b/conf/mastodon-streaming.service
index 5f66236..2e130d5 100644
--- a/conf/mastodon-streaming.service
+++ b/conf/mastodon-streaming.service
@@ -8,7 +8,9 @@
  WorkingDirectory=__FINALPATH__/live
  Environment="NODE_ENV=production"
  Environment="PORT=__PORT_STREAM__"
- ExecStart=/opt/node_n/n/versions/node/8/bin/npm run start
+ Environment="STREAMING_CLUSTER_NUM=1"
+ Environment=PATH=__NODEJS_PATH__
+ ExecStart=__NODEJS_PATH__/node ./streaming
  TimeoutSec=15
  Restart=always
  StandardError=syslog
diff --git a/conf/mastodon-web.service b/conf/mastodon-web.service
index 32af850..c95ba7f 100644
--- a/conf/mastodon-web.service
+++ b/conf/mastodon-web.service
@@ -9,6 +9,7 @@
  Environment="RAILS_ENV=production"
  Environment="PORT=__PORT_WEB__"
  ExecStart=/opt/rbenv/versions/2.6.0/bin/bundle exec puma -C config/puma.rb
+ ExecReload=/bin/kill -SIGUSR1 $MAINPID
  TimeoutSec=15
  Restart=always
  StandardError=syslog
diff --git a/conf/nginx.conf b/conf/nginx.conf
index a183a31..190c650 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -10,31 +10,48 @@ location / {
 	rewrite ^ https://$server_name$request_uri? permanent;
 	}
 
+	proxy_set_header Accept-Encoding "";
 	try_files $uri @proxy;
 
 	# Include SSOWAT user panel.
 	include conf.d/yunohost_panel.conf.inc;
 }
 
-# add to v1.4 assets
-location ~ ^/(assets|system/media_attachments/files|system/accounts/avatars) {
+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;
-  }
+}
+
+location /sw.js {
+    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_pass_header Server;
-	proxy_pass http://127.0.0.1:__PORT_WEB__;
-	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_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_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;
 }
 
 location /api/v1/streaming {
@@ -42,11 +59,17 @@ location /api/v1/streaming {
 	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_pass http://127.0.0.1:__PORT_STREAM__;
+	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