From 366bbcbd7445aeea810316ac2650ccbc502e377f Mon Sep 17 00:00:00 2001
From: Mastodon service <mastodon@berilium.arcepi.net>
Date: Tue, 15 Nov 2022 19:56:52 +0100
Subject: [PATCH] Fixed PID file creation. Stop now works.

---
 mastodon_sidekiq   | 2 +-
 mastodon_streaming | 2 +-
 mastodon_web       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mastodon_sidekiq b/mastodon_sidekiq
index 7c3a8c8..18f34f5 100755
--- a/mastodon_sidekiq
+++ b/mastodon_sidekiq
@@ -25,7 +25,7 @@ pid_file="/var/run/${name}.pid"
 
 mastodon_sidekiq_start(){
 	chdir /home/mastodon/live
-	/usr/sbin/daemon -S -l daemon -s debug -T ${name} \
+	/usr/sbin/daemon -S -l daemon -s debug -T "${name}" -p "${pid_file}" \
 		-u mastodon \
 		/usr/bin/env -i \
 		"RAILS_ENV=production" "DB_POOL=25" "HOME=/home/mastodon" \
diff --git a/mastodon_streaming b/mastodon_streaming
index 04cde4c..8243f19 100755
--- a/mastodon_streaming
+++ b/mastodon_streaming
@@ -24,7 +24,7 @@ pid_file="/var/run/${name}.pid"
 
 mastodon_streaming_start(){
 	chdir /home/mastodon/live
-	/usr/sbin/daemon -S -l daemon -s debug -T ${name} \
+	/usr/sbin/daemon -S -l daemon -s debug -T "${name}" -p "${pid_file}" \
 		-u mastodon \
 		/usr/bin/env -i \
 		"NODE_ENV=production" "PORT=4000" "HOME=/home/mastodon" \
diff --git a/mastodon_web b/mastodon_web
index a7895ff..2d47ffa 100755
--- a/mastodon_web
+++ b/mastodon_web
@@ -17,7 +17,7 @@
 name="mastodon_web"
 rcvar="${name}_enable"
 command="/usr/local/bin/bundle exec puma -C config/puma.rb"
-command_interpreter="/usr/local/bin/ruby"
+command_interpreter="/usr/local/bin/bundle"
 start_cmd="${name}_start"
 stop_cmd="${name}_stop"
 
@@ -25,7 +25,7 @@ pid_file="/var/run/${name}.pid"
 
 mastodon_web_start(){
 	chdir /home/mastodon/live
-	/usr/sbin/daemon -S -l daemon -s debug -T ${name} \
+	/usr/sbin/daemon -S -l daemon -s debug -T "${name}" -p "${pid_file}" \
 		-u mastodon \
 		/usr/bin/env -i \
 		"RAILS_ENV=production" "PORT=3000" "HOME=/home/mastodon" \