From a41ad38e7cda732c0d9399b100ec988698c6c3e9 Mon Sep 17 00:00:00 2001
From: Stefan Knoblich <stkn@bitplumber.de>
Date: Fri, 11 Nov 2022 16:28:16 +0100
Subject: [PATCH] gotosocial-bin: Set config path and command arguments

Signed-off-by: Stefan Knoblich <stkn@bitplumber.de>
---
 www-apps/gotosocial-bin/Manifest                 | 4 ++--
 www-apps/gotosocial-bin/files/gotosocial.initd   | 6 +++---
 www-apps/gotosocial-bin/files/gotosocial.service | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/www-apps/gotosocial-bin/Manifest b/www-apps/gotosocial-bin/Manifest
index 20b9354..bd30d69 100644
--- a/www-apps/gotosocial-bin/Manifest
+++ b/www-apps/gotosocial-bin/Manifest
@@ -1,5 +1,5 @@
 AUX gotosocial.confd 0 BLAKE2B 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
-AUX gotosocial.initd 905 BLAKE2B 3a33a8fb3d4a3d5cfcf13a44b30835d668ce203bb6b734852832855decc1340ebfce93ea7b4c67afb7bb13f97085a094b9f998dde86d26624b27313819695364 SHA512 8c414a0e6030c9c501a59d5f416d11f48fe35005f665ba953ce5cf8e4b077c18e9af854225d04276a4f91a6dfa422263ac694a5772cffe292dd8d2f6fad0b3e6
-AUX gotosocial.service 367 BLAKE2B 86102500908331201c74aec5e92e775c4b92cf4d3f6ea1088ff411f95b0304da43516a855ef58904f03d65c6196433bf54bf0fce0b30b5291a785def3acdbbc1 SHA512 a273c7762adc0f58f757325d404b9b42eec573c40f004cefc6be3c021d62909174ceb2045beac0e1cc97945a577327896f2551db4917c87dfda53a16f7050202
+AUX gotosocial.initd 942 BLAKE2B 420d6253405088d34356704a641a5a2d7c58529b727811e8ca87bbe76f152be9a8e965596596c2ab6eb8ece3974022b4613c5f60b34a0907ead2dd634d28168e SHA512 707f859711c4ce441defaefb85852b002f722642c1df07b9aa0dff5e364c55b412d014dcd968fe5966100a89cb4ea6008d1d32098b9f9e79c4c33438a05f79ac
+AUX gotosocial.service 368 BLAKE2B c1876066b64632dbd861b7c594507a6928ecbd3c9d58b4d6bedd7671bb7ed979a59b30469a4f673caa1c630a242e9aeef57207969a31aff9d66040968322fda4 SHA512 cf8a66a75e5eedecf2375a4036885467b623e11dbb3ad2f2d08bb7ecf9a41d9fedb61f43e7ff6e0e31e5fe5accf8b361d3f2ce72f3e1787d3f9867749cac9555
 DIST gotosocial-bin-0.5.2-linux-amd64.tar.gz 17118609 BLAKE2B 3722348ef486bb7b88b7a3bc9a05e6cc37840a68745248d8671ce44ab15faa6af76e8cae46f92931c27fb605d59a26b1e39889ceccb23dfb00d10be723bdbbf3 SHA512 c376101342e1d640a830d2514c5f0166bf22fb2192d64ad087dac3afb2ec5635ebf5ceb820e84d832e904417c242fdf7990a8bf2a5d6ee5689b1141a592e739b
 EBUILD gotosocial-bin-0.5.2.ebuild 995 BLAKE2B 7fcd37936c3bca14886497daf5c6f1ccba62a797aa16aa383bc41996f95715d30453d32203ed2cbd0df426e19b3b58df0d3d0b0ce344dd4ba15e14bffa58f1a2 SHA512 a87334dfb7f1d9ce4c2ddd493ec1091d2e832c81aa5499a65b8a480bb49a530e4fc3783b28c2e33feb66c71985351efe32da346a44eb413d33ef6f2c8bc37ed6
diff --git a/www-apps/gotosocial-bin/files/gotosocial.initd b/www-apps/gotosocial-bin/files/gotosocial.initd
index a50a37b..4dbd501 100644
--- a/www-apps/gotosocial-bin/files/gotosocial.initd
+++ b/www-apps/gotosocial-bin/files/gotosocial.initd
@@ -4,16 +4,16 @@
 
 GOTOSOCIAL_USER="${GOTOSOCIAL_USER:-gotosocial}"
 GOTOSOCIAL_GROUP="${GOTOSOCIAL_GROUP:-gotosocial}"
-GOTOSOCIAL_CONFIG="${GOTOSOCIAL_CONFIG:-/etc/gotosocial/config.yml}"
+GOTOSOCIAL_CONFIG="${GOTOSOCIAL_CONFIG:-/etc/gotosocial/config.yaml}"
 GOTOSOCIAL_DATA_DIR="${GOTOSOCIAL_DATA_DIR:-/var/lib/gotosocial}"
 GOTOSOCIAL_LOG_DIR="${GOTOSOCIAL_LOG_DIR:-/var/log/gotosocial}"
 
 command="/usr/bin/gotosocial"
-command_args="--config ${GOTOSOCIAL_CONFIG}"
+command_args="--config-path ${GOTOSOCIAL_CONFIG} server start"
 
 pidfile="/run/${RC_SVCNAME}.pid"
 command_background="true"
-start_stop_daemon_args="--user=\"${GOTOSOCIAL_USER}\" --group=\"${GOTOSOCIAL_GROUP}\" --stdout ${GOTOSOCIAL_LOG_DIR}/gotosocial.log --stderr ${GOTOSOCIAL_LOG_DIR}/gotosocial.err server start"
+start_stop_daemon_args="--user=\"${GOTOSOCIAL_USER}\" --group=\"${GOTOSOCIAL_GROUP}\" --stdout ${GOTOSOCIAL_LOG_DIR}/gotosocial.log --stderr ${GOTOSOCIAL_LOG_DIR}/gotosocial.err --chdir ${GOTOSOCIAL_DATA_DIR}"
 
 start_pre() {
 	checkpath -d -o "${GOTOSOCIAL_USER}" -m750 "${GOTOSOCIAL_DATA_DIR}"
diff --git a/www-apps/gotosocial-bin/files/gotosocial.service b/www-apps/gotosocial-bin/files/gotosocial.service
index 58c06a6..43ef8c7 100644
--- a/www-apps/gotosocial-bin/files/gotosocial.service
+++ b/www-apps/gotosocial-bin/files/gotosocial.service
@@ -12,7 +12,7 @@ CacheDirectoryMode=0750
 User=gotosocial
 Group=gotosocial
 
-ExecStart=/usr/bin/gotosocial --config /etc/gotosocial/config.yml server start
+ExecStart=/usr/bin/gotosocial --config /etc/gotosocial/config.yaml server start
 
 [Install]
 WantedBy=multi-user.target