From d3df899e0a99a63ee1cf7ad845cc513aeaaf30ef Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Thu, 4 Jun 2020 00:36:02 +0200
Subject: Implement new nodejs helper

---
 conf/mastodon-sidekiq.service   | 2 +-
 conf/mastodon-streaming.service | 4 ++--
 conf/mastodon-web.service       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'conf')

diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service
index 73f29e5..a4fc0da 100644
--- a/conf/mastodon-sidekiq.service
+++ b/conf/mastodon-sidekiq.service
@@ -9,7 +9,7 @@
  Environment="RAILS_ENV=production"
  Environment="DB_POOL=25"
  Environment="MALLOC_ARENA_MAX=2"
- ExecStart=__RBENVROOT__/shims/bundle exec sidekiq -c 25
+ ExecStart=__RBENV_ROOT__/shims/bundle exec sidekiq -c 25
  TimeoutSec=15
  Restart=always
  StandardError=syslog
diff --git a/conf/mastodon-streaming.service b/conf/mastodon-streaming.service
index 2e130d5..94309c1 100644
--- a/conf/mastodon-streaming.service
+++ b/conf/mastodon-streaming.service
@@ -9,8 +9,8 @@
  Environment="NODE_ENV=production"
  Environment="PORT=__PORT_STREAM__"
  Environment="STREAMING_CLUSTER_NUM=1"
- Environment=PATH=__NODEJS_PATH__
- ExecStart=__NODEJS_PATH__/node ./streaming
+ Environment=__YNH_LOAD_NODE_PATH__
+ ExecStart=__YNH_NODE__ ./streaming
  TimeoutSec=15
  Restart=always
  StandardError=syslog
diff --git a/conf/mastodon-web.service b/conf/mastodon-web.service
index 14d1260..bb07cf4 100644
--- a/conf/mastodon-web.service
+++ b/conf/mastodon-web.service
@@ -8,7 +8,7 @@
  WorkingDirectory=__FINALPATH__/live
  Environment="RAILS_ENV=production"
  Environment="PORT=__PORT_WEB__"
- ExecStart=__RBENVROOT__/shims/bundle exec puma -C config/puma.rb
+ ExecStart=__RBENV_ROOT__/shims/bundle exec puma -C config/puma.rb
  ExecReload=/bin/kill -SIGUSR1 $MAINPID
  TimeoutSec=15
  Restart=always
-- 
cgit v1.2.3-70-g09d2