From d0f80ac24a0617ac5003ed584fdd30d66f540648 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 10 Jul 2024 21:42:04 -0400 Subject: [PATCH] user/mastodon: fix initd scripts --- user/mastodon/APKBUILD | 10 +++++----- user/mastodon/mastodon.initd | 1 + user/mastodon/mastodon.sidekiq.initd | 2 +- user/mastodon/mastodon.streaming.initd | 2 +- user/mastodon/mastodon.web.initd | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/user/mastodon/APKBUILD b/user/mastodon/APKBUILD index 84f6b6b..f373cb0 100644 --- a/user/mastodon/APKBUILD +++ b/user/mastodon/APKBUILD @@ -5,7 +5,7 @@ pkgname=mastodon _pkgname=$pkgname pkgver=4.2.10 _gittag=v$pkgver -pkgrel=0 +pkgrel=1 pkgdesc="Self-hosted social media and network server based on ActivityPub and OStatus" arch="x86_64" url="https://github.com/mastodon/mastodon" @@ -194,10 +194,10 @@ assets() { sha512sums=" 1fe5417136bc020a83b83eaccef7f1f46c13fc8318681f12ba556b1b6b03e25ef7b6335c28f4e6722101e97b63020cbd0d3fbacdaf9b3b5a4b73c3cf3e230813 mastodon-v4.2.10.tar.gz -36604cd630f0f5b4d88b630b1512cd26e922f859e5d19cbb85106ff29fc9048d2349f926d5c4b6947c655f67e60ec33e2f524a8154405a4369f283e00be7cdce mastodon.initd -9e77061fbdebe90492398f8089a7d2612ff4b6e70b5462dd67330b66d9788cb0133eab38c372b1f27a7214aacdd9f7f70381d4ecc6e92c8c38d794404ae0f840 mastodon.web.initd -6dacafca86dd39f6a6efa773cfe35b4632098175605a7c64488027237b01028d9785e50a3a0532b88ebf8f857c9a594c7b68f9e577b46e95104e7cffde51ccf8 mastodon.sidekiq.initd -63b67ec16107e4d1747ae956cdd41edd03be71da1ed96d21a18710cbba69ce37c856f4abc080a61f172a10859d0b9a33ba9290fc69213e1bc15a1ce8f8d40108 mastodon.streaming.initd +d49fea9451c97ccefe5e35b68e4274aeb427f9d1e910b89c1f6c810489c3bec1ccff72952fdaef95abf944b8aff0da84a52347540d36ff1fba5ccc19e1d935c6 mastodon.initd +eefe12a31268245f802222c0001dac884e03adb0d301e53a1512a3cd204836ca03ad083908cd14d146cf0dce99e3a4366570efd0e40a9a490ccd381d4c63c32f mastodon.web.initd +8fc9249c01693bb02b8d1a6177288d5d3549addde8c03eb35cc7a32dde669171872ebc2b5deb8019dc7a12970098f1af707171fa41129be31b04e1dc1651a777 mastodon.sidekiq.initd +03433a2f58600ca0d58e7c3713df2146ccdfc92033ccfe801dbd38bac39b66d6297f2b5ca02300caa36455b484eab2caa68c912c2f72150203bfa0e106c375fc mastodon.streaming.initd 83b3bae5b6fdb4d0dbc1cbe546c62c0aa77397b97d1a5d5377af032466677de188065b556710c0d96576bbae89cc76800f1ffb8cd718155eb2784da818f27619 mastodon.logrotate dfd0e43ac6c28387bd4aa57fd98ae41aeb5a098b6deb3e44b89f07818e2470773b025364afee7ef6fd0f664cb86bbbbe8796c9f222f5436c256a787282fbe3e1 bin-wrapper.in " diff --git a/user/mastodon/mastodon.initd b/user/mastodon/mastodon.initd index 6d9c704..1454603 100644 --- a/user/mastodon/mastodon.initd +++ b/user/mastodon/mastodon.initd @@ -6,6 +6,7 @@ description="Meta script for starting/stopping all the Mastodon components" subservices="mastodon.sidekiq mastodon.streaming mastodon.web" depend() { + need redis postgresql use net } diff --git a/user/mastodon/mastodon.sidekiq.initd b/user/mastodon/mastodon.sidekiq.initd index f7d62b0..98c0377 100644 --- a/user/mastodon/mastodon.sidekiq.initd +++ b/user/mastodon/mastodon.sidekiq.initd @@ -1,7 +1,7 @@ #!/sbin/openrc-run name="Mastodon background workers Service" -root="/usr/share/webapps/mastodon" +root="/usr/lib/bundles/mastodon" pidfile="/run/mastodon-sidekiq.pid" logfile="/var/log/mastodon/sidekiq.log" diff --git a/user/mastodon/mastodon.streaming.initd b/user/mastodon/mastodon.streaming.initd index 647f719..b41adc2 100644 --- a/user/mastodon/mastodon.streaming.initd +++ b/user/mastodon/mastodon.streaming.initd @@ -1,7 +1,7 @@ #!/sbin/openrc-run name="Mastodon streaming API service" -root="/usr/share/webapps/mastodon" +root="/usr/lib/bundles/mastodon" pidfile="/run/mastodon-streaming.pid" logfile="/var/log/mastodon/streaming.log" diff --git a/user/mastodon/mastodon.web.initd b/user/mastodon/mastodon.web.initd index 1a82acb..42eace6 100644 --- a/user/mastodon/mastodon.web.initd +++ b/user/mastodon/mastodon.web.initd @@ -1,7 +1,7 @@ #!/sbin/openrc-run name="Mastodon Web Service" -root="/usr/share/webapps/mastodon" +root="/usr/lib/bundles/mastodon" pidfile="/run/mastodon-web.pid" logfile="/var/log/mastodon/web.log" -- 2.45.2