aboutsummaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorTagadda <36127788+Tagadda@users.noreply.github.com>2022-01-24 14:08:41 +0000
committerTagada <36127788+Tagadda@users.noreply.github.com>2022-01-25 19:11:39 +0100
commit4df90d26467ac1f20f505cd82b131d697797ac0e (patch)
tree3813364f5c3452a69bd085a250af6346fe1658bd /conf
parent0becd5049e4f5858c79e012934d557dbaa8706a6 (diff)
downloadmastodon_ynh-4df90d26467ac1f20f505cd82b131d697797ac0e.tar.gz
mastodon_ynh-4df90d26467ac1f20f505cd82b131d697797ac0e.tar.bz2
mastodon_ynh-4df90d26467ac1f20f505cd82b131d697797ac0e.zip
[enh] Workaround for bullseye
see https://github.com/mastodon/mastodon/issues/15751#issuecomment-873594463
Diffstat (limited to 'conf')
-rw-r--r--conf/cron10
-rw-r--r--conf/mastodon-sidekiq.service1
-rw-r--r--conf/mastodon-web.service1
3 files changed, 7 insertions, 5 deletions
diff --git a/conf/cron b/conf/cron
index 710e7f0..c5f1af0 100644
--- a/conf/cron
+++ b/conf/cron
@@ -1,5 +1,5 @@
-@daily cd __FINAL_PATH__/live && sudo -u __APP__ __YNH_RUBY_LOAD_PATH__ RAILS_ENV=production bin/tootctl media remove
-@monthly cd __FINAL_PATH__/live && sudo -u __APP__ __YNH_RUBY_LOAD_PATH__ RAILS_ENV=production bin/tootctl media remove-orphans
-@monthly cd __FINAL_PATH__/live && sudo -u __APP__ __YNH_RUBY_LOAD_PATH__ RAILS_ENV=production bin/tootctl accounts cull
-@monthly cd __FINAL_PATH__/live && sudo -u __APP__ __YNH_RUBY_LOAD_PATH__ RAILS_ENV=production bin/tootctl statuses remove
-@monthly cd __FINAL_PATH__/live && sudo -u __APP__ __YNH_RUBY_LOAD_PATH__ RAILS_ENV=production bin/tootctl preview_cards remove
+@daily cd __FINAL_PATH__/live && sudo -u __APP__ __YNH_RUBY_LOAD_PATH__ __LD_PRELOAD__ RAILS_ENV=production bin/tootctl media remove
+@monthly cd __FINAL_PATH__/live && sudo -u __APP__ __YNH_RUBY_LOAD_PATH__ __LD_PRELOAD__ RAILS_ENV=production bin/tootctl media remove-orphans
+@monthly cd __FINAL_PATH__/live && sudo -u __APP__ __YNH_RUBY_LOAD_PATH__ __LD_PRELOAD__ RAILS_ENV=production bin/tootctl accounts cull
+@monthly cd __FINAL_PATH__/live && sudo -u __APP__ __YNH_RUBY_LOAD_PATH__ __LD_PRELOAD__ RAILS_ENV=production bin/tootctl statuses remove
+@monthly cd __FINAL_PATH__/live && sudo -u __APP__ __YNH_RUBY_LOAD_PATH__ __LD_PRELOAD__ RAILS_ENV=production bin/tootctl preview_cards remove
diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service
index f91b7b9..d561f07 100644
--- a/conf/mastodon-sidekiq.service
+++ b/conf/mastodon-sidekiq.service
@@ -9,6 +9,7 @@ WorkingDirectory=__FINALPATH__/live
Environment="RAILS_ENV=production"
Environment="DB_POOL=25"
Environment="MALLOC_ARENA_MAX=2"
+Environment="__LD_PRELOAD__"
ExecStart=__RBENV_ROOT__/versions/__APP__/bin/bundle exec sidekiq -c 25
TimeoutSec=15
Restart=always
diff --git a/conf/mastodon-web.service b/conf/mastodon-web.service
index 24ab72a..295d504 100644
--- a/conf/mastodon-web.service
+++ b/conf/mastodon-web.service
@@ -8,6 +8,7 @@ User=__APP__
WorkingDirectory=__FINALPATH__/live
Environment="RAILS_ENV=production"
Environment="PORT=__PORT_WEB__"
+Environment="__LD_PRELOAD__"
ExecStart=__RBENV_ROOT__/versions/__APP__/bin/bundle exec puma -C config/puma.rb
ExecReload=/bin/kill -SIGUSR1 $MAINPID
TimeoutSec=15