aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTagadda <36127788+Tagadda@users.noreply.github.com>2022-01-26 12:06:58 +0000
committerTagadda <36127788+Tagadda@users.noreply.github.com>2022-01-26 12:06:58 +0000
commit82cde79b1d4b30280ea6fea9102986c803da5003 (patch)
tree419564b62f0afe08d88a5528e825ba899c86ecfc
parent03cd9df2b604fc833f8213f44b49daac3a39763a (diff)
downloadmastodon_ynh-82cde79b1d4b30280ea6fea9102986c803da5003.tar.gz
mastodon_ynh-82cde79b1d4b30280ea6fea9102986c803da5003.tar.bz2
mastodon_ynh-82cde79b1d4b30280ea6fea9102986c803da5003.zip
don't reset Environment when LD_PRELOAD not set
-rw-r--r--conf/mastodon-sidekiq.service2
-rw-r--r--conf/mastodon-web.service2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service
index d561f07..47fe663 100644
--- a/conf/mastodon-sidekiq.service
+++ b/conf/mastodon-sidekiq.service
@@ -6,10 +6,10 @@ After=network.target
Type=simple
User=__APP__
WorkingDirectory=__FINALPATH__/live
+Environment="__LD_PRELOAD__"
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 295d504..edf41f7 100644
--- a/conf/mastodon-web.service
+++ b/conf/mastodon-web.service
@@ -6,9 +6,9 @@ After=network.target
Type=simple
User=__APP__
WorkingDirectory=__FINALPATH__/live
+Environment="__LD_PRELOAD__"
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