From 0ecdb6e3c330b9594a83443ea60597f8367c55bf Mon Sep 17 00:00:00 2001
From: Tagada <36127788+Tagadda@users.noreply.github.com>
Date: Mon, 18 May 2020 15:23:13 +0200
Subject: Fix nginx.conf for multi-instance

---
 conf/nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 7fa7b87..d348613 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -38,7 +38,7 @@ location @proxy {
   proxy_set_header Proxy "";
   proxy_pass_header Server;
 
-  proxy_pass http://127.0.0.1:3000;
+  proxy_pass http://127.0.0.1:__PORT_WEB__;
   proxy_buffering on;
   proxy_redirect off;
   proxy_http_version 1.1;
@@ -62,7 +62,7 @@ location /api/v1/streaming {
   proxy_set_header X-Forwarded-Proto https;
   proxy_set_header Proxy "";
 
-  proxy_pass http://127.0.0.1:4000;
+  proxy_pass http://127.0.0.1:__PORT_STREAM__;
   proxy_buffering off;
   proxy_redirect off;
   proxy_http_version 1.1;
-- 
cgit v1.2.3-70-g09d2


From 736d7908b4f31095e7a7b92fc632b0f6fad05e83 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 19 May 2020 01:20:45 +0200
Subject: RUBY_VERSION factorisation

---
 conf/cron                     |  2 +-
 conf/mastodon-sidekiq.service |  2 +-
 conf/mastodon-web.service     |  2 +-
 scripts/_common.sh            |  2 ++
 scripts/install               | 28 +++++++++++++++++-----------
 scripts/restore               |  8 +++++---
 scripts/upgrade               | 25 +++++++++++++++----------
 7 files changed, 42 insertions(+), 27 deletions(-)

(limited to 'conf')

diff --git a/conf/cron b/conf/cron
index 9a984a3..8bf7bdb 100644
--- a/conf/cron
+++ b/conf/cron
@@ -1,2 +1,2 @@
 RAILS_ENV=production
-@daily cd __FINAL__PATH__/live && /opt/rbenv/versions/2.6.5/bin/bundle exec rake __USER__:media:remove_remote
+@daily cd __FINAL__PATH__/live && __RBENVROOT__/shims/bundle exec rake __USER__:media:remove_remote
diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service
index d5fc7e1..73f29e5 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=/opt/rbenv/versions/2.6.5/bin/bundle exec sidekiq -c 25
+ ExecStart=__RBENVROOT__/shims/bundle exec sidekiq -c 25
  TimeoutSec=15
  Restart=always
  StandardError=syslog
diff --git a/conf/mastodon-web.service b/conf/mastodon-web.service
index bb65afe..14d1260 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=/opt/rbenv/versions/2.6.5/bin/bundle exec puma -C config/puma.rb
+ ExecStart=__RBENVROOT__/shims/bundle exec puma -C config/puma.rb
  ExecReload=/bin/kill -SIGUSR1 $MAINPID
  TimeoutSec=15
  Restart=always
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 015c1e9..f39b966 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -7,6 +7,8 @@
 # dependencies used by the app
 pkg_dependencies="imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git-core g++ libprotobuf-dev protobuf-compiler pkg-config gcc autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm3|libgdbm6 libgdbm-dev redis-server redis-tools postgresql postgresql-contrib libidn11-dev libicu-dev libjemalloc-dev curl apt-transport-https"
 
+RUBY_VERSION="2.6.5"
+
 #=================================================
 # PERSONAL HELPERS
 #=================================================
diff --git a/scripts/install b/scripts/install
index 409911b..2e218c6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -20,6 +20,7 @@ source /usr/share/yunohost/helpers
 ynh_script_progression --message="Managing script failure..." --weight=1
 
 ynh_clean_setup () {
+	read -p "key"
 	ynh_clean_check_starting
 }
 # Exit if an error occurs during the execution of the script
@@ -153,9 +154,11 @@ ynh_add_swap --size=$swap_needed
 #=================================================
 ynh_script_progression --message="Installing Ruby..." --weight=424
 
-ynh_install_ruby --ruby_version=2.6.5
-/opt/rbenv/versions/2.6.5/bin/gem update --system
-/opt/rbenv/versions/2.6.5/bin/gem install bundler:1.17.3 --no-document
+ynh_install_ruby --ruby_version=$RUBY_VERSION
+pushd "$final_path/live"
+	gem update --system
+	gem install bundler:1.17.3 --no-document
+popd
 
 #=================================================
 # MODIFY A CONFIG FILE
@@ -194,13 +197,13 @@ chown -R "$app": "$final_path"
 
 pushd "$final_path/live"
 	ynh_use_nodejs
-	sudo -u "$app" env PATH=$PATH /opt/rbenv/versions/2.6.5/bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without development test
-	sudo -u "$app" env PATH=$PATH yarn install --pure-lockfile
-	sudo -u "$app" echo "SAFETY_ASSURED=1">> $config
-	sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.5/bin/bundle exec rails db:setup --quiet
-	sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.5/bin/bundle exec rails assets:precompile --quiet
-	sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.5/bin/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt
-	sudo -u "$app" env PATH=$PATH RAILS_ENV=production bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=admin > acc.txt
+	 bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without development test
+	yarn install --pure-lockfile
+	echo "SAFETY_ASSURED=1">> $config
+	RAILS_ENV=production bundle exec rails db:setup --quiet
+	RAILS_ENV=production bundle exec rails assets:precompile --quiet
+	RAILS_ENV=production bundle exec rake mastodon:webpush:generate_vapid_key > key.txt
+	RAILS_ENV=production bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=admin > acc.txt
 popd
 
 admin_pass=$( tail -1 $final_path/live/acc.txt | head -1 | cut -c 15- )
@@ -224,7 +227,8 @@ ynh_script_progression --message="Setuping a cron job for removing cache..." --w
 
 ynh_replace_string --match_string="__FINAL_PATH__" --replace_string="$final_path" --target_file="../conf/cron"
 ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="../conf/cron"
-sudo cp -f ../conf/cron /etc/cron.d/$app 
+ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/cron"
+cp -f ../conf/cron /etc/cron.d/$app 
 
 #=================================================
 # SETUP SYSTEMD
@@ -233,6 +237,8 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=5
 
 # Create a dedicated systemd config
 ynh_replace_string --match_string="__PORT_WEB__" --replace_string="$port_web" --target_file="../conf/mastodon-web.service"
+ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/mastodon-web.service"
+ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/mastodon-sidekiq.service"
 ynh_replace_string --match_string="__PORT_STREAM__" --replace_string="$port_stream" --target_file="../conf/mastodon-streaming.service"
 ynh_replace_string --match_string="__NODEJS_PATH__" --replace_string="$nodejs_path" --target_file="../conf/mastodon-streaming.service"
 ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service"
diff --git a/scripts/restore b/scripts/restore
index c6e4bc8..bd79e95 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -114,9 +114,11 @@ ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ st
 #=================================================
 ynh_script_progression --message="Installing Ruby..." --weight=393
 
-ynh_install_ruby --ruby_version=2.6.5
-/opt/rbenv/versions/2.6.5/bin/gem update --system
-/opt/rbenv/versions/2.6.5/bin/gem install bundler:1.17.3 --no-document
+ynh_install_ruby --ruby_version=$RUBY_VERSION
+pushd "$final_path/live"
+	gem update --system
+	gem install bundler:1.17.3 --no-document
+popd
 
 #=================================================
 # RESTORE THE POSTGRESQL DATABASE
diff --git a/scripts/upgrade b/scripts/upgrade
index 98d0403..f34010b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -249,9 +249,11 @@ ynh_add_swap --size=$swap_needed
 #=================================================
 ynh_script_progression --message="Installing Ruby..." --weight=424
 
-ynh_install_ruby --ruby_version=2.6.5
-/opt/rbenv/versions/2.6.5/bin/gem update --system
-/opt/rbenv/versions/2.6.5/bin/gem install bundler:1.17.3 --no-document
+ynh_install_ruby --ruby_version=$RUBY_VERSION
+pushd "$final_path/live"
+	gem update --system
+	gem install bundler:1.17.3 --no-document
+popd
 
 #=================================================
 # MODIFY A CONFIG FILE
@@ -287,12 +289,12 @@ chown -R "$app": "$final_path"
 
 pushd "$final_path/live"
     ynh_use_nodejs
-    sudo -u "$app" env PATH=$PATH /opt/rbenv/versions/2.6.5/bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without development test
-    sudo -u "$app" env PATH=$PATH yarn install --pure-lockfile
-    sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.5/bin/bundle exec rails assets:clean
-    sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.5/bin/bundle exec rails assets:precompile
-    sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.5/bin/bundle exec rails db:migrate
-    sudo -u "$app" env PATH=$PATH RAILS_ENV=production bin/tootctl cache clear
+    bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without development test
+    yarn install --pure-lockfile
+    RAILS_ENV=production bundle exec rails assets:clean
+    RAILS_ENV=production bundle exec rails assets:precompile
+    RAILS_ENV=production bundle exec rails db:migrate
+    RAILS_ENV=production bin/tootctl cache clear
 popd
 
 # Recalculate and store the checksum of the file for the next upgrade.
@@ -305,7 +307,8 @@ ynh_script_progression --message="Setuping a cron job for removing cache..." --w
 
 ynh_replace_string --match_string="__FINAL_PATH__" --replace_string="$final_path" --target_file="../conf/cron"
 ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="../conf/cron"
-sudo cp -f ../conf/cron /etc/cron.d/$app 
+ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/cron"
+cp -f ../conf/cron /etc/cron.d/$app 
 
 #=================================================
 # SETUP SYSTEMD
@@ -314,6 +317,8 @@ ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
 
 # Create a dedicated systemd config
 ynh_replace_string --match_string="__PORT_WEB__" --replace_string="$port_web" --target_file="../conf/mastodon-web.service"
+ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/mastodon-web.service"
+ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/mastodon-sidekiq.service"
 ynh_replace_string --match_string="__PORT_STREAM__" --replace_string="$port_stream" --target_file="../conf/mastodon-streaming.service"
 ynh_replace_string --match_string="__NODEJS_PATH__" --replace_string="$nodejs_path" --target_file="../conf/mastodon-streaming.service"
 ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service"
-- 
cgit v1.2.3-70-g09d2


From 5f421f48d7fb69b8c8adafad48b93bbb621c6dce Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 19 May 2020 19:20:06 +0200
Subject: Fix CRON

---
 conf/cron       | 2 +-
 scripts/install | 2 --
 scripts/upgrade | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'conf')

diff --git a/conf/cron b/conf/cron
index 8bf7bdb..af98c3c 100644
--- a/conf/cron
+++ b/conf/cron
@@ -1,2 +1,2 @@
 RAILS_ENV=production
-@daily cd __FINAL__PATH__/live && __RBENVROOT__/shims/bundle exec rake __USER__:media:remove_remote
+@daily cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl media remove
diff --git a/scripts/install b/scripts/install
index 1f1a11f..32cb94e 100644
--- a/scripts/install
+++ b/scripts/install
@@ -230,8 +230,6 @@ ynh_secure_remove --file="$final_path/live/key.txt"
 ynh_script_progression --message="Setuping a cron job for removing cache..." --weight=1
 
 ynh_replace_string --match_string="__FINAL_PATH__" --replace_string="$final_path" --target_file="../conf/cron"
-ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="../conf/cron"
-ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/cron"
 cp -f ../conf/cron /etc/cron.d/$app 
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index da0e7bb..0a19125 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -308,8 +308,6 @@ ynh_store_file_checksum --file="$config"
 ynh_script_progression --message="Setuping a cron job for removing cache..." --weight=1
 
 ynh_replace_string --match_string="__FINAL_PATH__" --replace_string="$final_path" --target_file="../conf/cron"
-ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="../conf/cron"
-ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/cron"
 cp -f ../conf/cron /etc/cron.d/$app 
 
 #=================================================
-- 
cgit v1.2.3-70-g09d2


From 1977f0fff725ff589618fffc18e861b264f46891 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 19 May 2020 23:57:16 +0200
Subject: Imrpove cron

---
 conf/cron | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/cron b/conf/cron
index af98c3c..1296c1b 100644
--- a/conf/cron
+++ b/conf/cron
@@ -1,2 +1,4 @@
-RAILS_ENV=production
 @daily cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl media remove
+@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl media remove-orphans
+@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl accounts cull
+@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl status remove
-- 
cgit v1.2.3-70-g09d2


From b4dc3908d08cb1767dbe729ea2cc8956369359c3 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 22 May 2020 03:12:41 +0200
Subject: add tootctl preview_cards remove

---
 conf/cron | 1 +
 1 file changed, 1 insertion(+)

(limited to 'conf')

diff --git a/conf/cron b/conf/cron
index 1296c1b..f3cae63 100644
--- a/conf/cron
+++ b/conf/cron
@@ -2,3 +2,4 @@
 @monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl media remove-orphans
 @monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl accounts cull
 @monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl status remove
+@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl preview_cards remove
-- 
cgit v1.2.3-70-g09d2


From 29c9a33cdb9f11f14083bebaa519bf7a6f762cfc Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 22 May 2020 03:16:41 +0200
Subject: fix tootctl statuses remove

---
 conf/cron | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/cron b/conf/cron
index f3cae63..776808b 100644
--- a/conf/cron
+++ b/conf/cron
@@ -1,5 +1,5 @@
 @daily cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl media remove
 @monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl media remove-orphans
 @monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl accounts cull
-@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl status remove
+@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl statuses remove
 @monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl preview_cards remove
-- 
cgit v1.2.3-70-g09d2


From 1f9dc463f214a8692e99ca1f3273461dda55e8fd Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 26 May 2020 14:39:04 +0200
Subject: switching from add_header to more_set_headers

---
 conf/nginx.conf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'conf')

diff --git a/conf/nginx.conf b/conf/nginx.conf
index d348613..866fcc7 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -19,14 +19,14 @@ location / {
 }
 
 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";
+  more_set_headers "Cache-Control: public, max-age=31536000, immutable";
+  more_set_headers "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";
+  more_set_headers "Cache-Control: public, max-age=0";
+  more_set_headers "Strict-Transport-Security: max-age=31536000";
   try_files $uri @proxy;
 }
 
@@ -49,8 +49,8 @@ location @proxy {
   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";
+  more_set_headers "X-Cached: $upstream_cache_status";
+  more_set_headers "Strict-Transport-Security: max-age=31536000";
 
   tcp_nodelay on;
 }
-- 
cgit v1.2.3-70-g09d2


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 +-
 manifest.json                   |  2 +-
 scripts/install                 | 11 +++--------
 scripts/upgrade                 | 11 +++--------
 6 files changed, 11 insertions(+), 21 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
diff --git a/manifest.json b/manifest.json
index 9041ab7..a6dbf25 100644
--- a/manifest.json
+++ b/manifest.json
@@ -23,7 +23,7 @@
         }
     ],
     "requirements": {
-        "yunohost": ">= 3.8.1"
+        "yunohost": ">= 3.8.2"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/install b/scripts/install
index ebc4173..53b598b 100644
--- a/scripts/install
+++ b/scripts/install
@@ -230,14 +230,9 @@ cp -f ../conf/cron /etc/cron.d/$app
 ynh_script_progression --message="Configuring a systemd service..."
 
 # Create a dedicated systemd config
-ynh_replace_string --match_string="__PORT_WEB__" --replace_string="$port_web" --target_file="../conf/mastodon-web.service"
-ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/mastodon-web.service"
-ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/mastodon-sidekiq.service"
-ynh_replace_string --match_string="__PORT_STREAM__" --replace_string="$port_stream" --target_file="../conf/mastodon-streaming.service"
-ynh_replace_string --match_string="__NODEJS_PATH__" --replace_string="$nodejs_path" --target_file="../conf/mastodon-streaming.service"
-ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service"
-ynh_add_systemd_config --service="$app-sidekiq" --template="mastodon-sidekiq.service"
-ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming.service"
+ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service" --others_var="port_web RBENV_ROOT"
+ynh_add_systemd_config --service="$app-sidekiq" --template="mastodon-sidekiq.service" --others_var="RBENV_ROOT"
+ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming.service" --others_var="port_stream ynh_node_load_PATH ynh_node"
 
 #=================================================
 # STORE THE CONFIG FILE CHECKSUM
diff --git a/scripts/upgrade b/scripts/upgrade
index 8441307..6445cc8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -313,14 +313,9 @@ cp -f ../conf/cron /etc/cron.d/$app
 ynh_script_progression --message="Upgrading systemd configuration..."
 
 # Create a dedicated systemd config
-ynh_replace_string --match_string="__PORT_WEB__" --replace_string="$port_web" --target_file="../conf/mastodon-web.service"
-ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/mastodon-web.service"
-ynh_replace_string --match_string="__RBENVROOT__" --replace_string="$RBENV_ROOT" --target_file="../conf/mastodon-sidekiq.service"
-ynh_replace_string --match_string="__PORT_STREAM__" --replace_string="$port_stream" --target_file="../conf/mastodon-streaming.service"
-ynh_replace_string --match_string="__NODEJS_PATH__" --replace_string="$nodejs_path" --target_file="../conf/mastodon-streaming.service"
-ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service"
-ynh_add_systemd_config --service="$app-sidekiq" --template="mastodon-sidekiq.service"
-ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming.service"
+ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service" --others_var="port_web RBENV_ROOT"
+ynh_add_systemd_config --service="$app-sidekiq" --template="mastodon-sidekiq.service" --others_var="RBENV_ROOT"
+ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming.service" --others_var="port_stream ynh_node_load_PATH ynh_node"
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
-- 
cgit v1.2.3-70-g09d2