From 636a23be5191ec3be03f26389620b1bf37d57cbb Mon Sep 17 00:00:00 2001 From: Stefan Knoblich Date: Tue, 9 May 2023 16:33:01 +0200 Subject: [PATCH] net-im/dendrite: Installation directories and init script fixes Signed-off-by: Stefan Knoblich --- net-im/dendrite/Manifest | 4 ++-- net-im/dendrite/dendrite-0.13.0_pre20230509.ebuild | 7 +++++-- net-im/dendrite/files/dendrite.initd | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/net-im/dendrite/Manifest b/net-im/dendrite/Manifest index bc79015..9375bf2 100644 --- a/net-im/dendrite/Manifest +++ b/net-im/dendrite/Manifest @@ -1,6 +1,6 @@ AUX dendrite.confd 0 BLAKE2B 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e -AUX dendrite.initd 838 BLAKE2B 3782b011a25a2b52ad60b68bf114c38eaad6e438e877b22d94a4dcb90a57ccab7442c6256cf73205e294249ead47bca6db9846d30ce8ee2b353286228e05e3ac SHA512 c30fff665cbeedd12934c2767d7e0e7256adf80121d06958fe190af049bd73e274a25e04d423fe27ef3f563430a95b0f243450474026173b19eaafef02bfd965 +AUX dendrite.initd 882 BLAKE2B d8accb302c67eae3453fc42dbf155cd6150d9c0936e34f766f35642b28bc6136cf12bb6484f1586db4a34e04dac89f27dd4a4420768794b0134859fa97a8f678 SHA512 838e2c44e5a29c48a23664c0931d4db2ddf3436362fd6b2276a5a77a5dd48e2966fdc62d32b1c5c7692ff7061c93fe105f453ff595e613c43be6f98b4d52b177 AUX dendrite.service 344 BLAKE2B 506c7145a9902c1bb10d3372f0556b39155adb6751f07cb877560f66323e4c2d2eb2d701d1d44d20c4a65fe818910cbc2fb3ac930debe9487c431a3624aa9803 SHA512 5887907a9f01ba9ecd8b57fa9e0db8930f900368e3487de1455362aa499570e0cecb91d4fddacc86aca56b835e1630b0be3fd874477941a7e637d7f38304f06e DIST dendrite-0.13.0_pre20230509-deps.tar.xz 551029632 BLAKE2B e9f3028f2388c098df0eea919c82d6f6751e3af4e5aad228d072c1ebe4831058c33341e7abfbbaf9b62dd065876fa6673de952a82f91103247de6810e1326b3f SHA512 5ba5d740178de68fce625b9667f02cd0c0e1c25f6bcc571a04198992d8be181b3241ade308229e4fdd03b1fcc8a2f528cfccaee196271aead99b5fff27462dd9 DIST dendrite-0.13.0_pre20230509.tar.gz 1230362 BLAKE2B aae4d9b9467cf4387f4d53752875d442775ff26b3fe2550c4333a51824fbf0a0d6038a634488c1d90f6c60e8f871b33c4596af4348607aa768630fc91944488b SHA512 0405d4b56792718aaa652547950a9bd0ce19d35c214b42bf86c6609bb01e850f84dcdb5e97000815779b0f8a803454c75bc6bea1a9384aa66a3c441d7be3bfd1 -EBUILD dendrite-0.13.0_pre20230509.ebuild 997 BLAKE2B 8d6c39cb66aff02e34437bfdcb4acdbcf6d2420fcd17061b9bfa122ab0cc6cad1cb134aa53f43c568f61b7e0a700704cc513c3693a9e5381cc7471091e517765 SHA512 907168512dcfc0ecdfb3a7e5ddcbaa889c52f6c7c82ee113e11942fd82e560001eb34b33a0076ffd26b23839dd38679cb8270c2af5d21e6f4e38329bd4712d2a +EBUILD dendrite-0.13.0_pre20230509.ebuild 1054 BLAKE2B 6b445f20267ff9fe4807be43916baceaf4256ab0fbeeb41a989d76e5f1c0f7d67895415d966ef5f67c3de6445798ab1c1ec7c95e9d31b612bc8845485d7b4fe5 SHA512 950d78d6b398382d291d14c37820f5d43b63e95d8f50137029a38eabc32f6b618d5998c711c26e2af04922c252390a3de93b5cf7a08ba07fffbc6223ac9849cf diff --git a/net-im/dendrite/dendrite-0.13.0_pre20230509.ebuild b/net-im/dendrite/dendrite-0.13.0_pre20230509.ebuild index 8b92f5b..bf08987 100644 --- a/net-im/dendrite/dendrite-0.13.0_pre20230509.ebuild +++ b/net-im/dendrite/dendrite-0.13.0_pre20230509.ebuild @@ -30,12 +30,15 @@ src_install() { newbin bin/create-account dendrite-create-account default - newinitd "${FILESDIR}/${PN}.initd" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" systemd_dounit "${FILESDIR}/${PN}.service" diropts -m 0750 -o "${PN}" -g "${PN}" + keepdir "/var/lib/${PN}" + keepdir "/var/log/${PN}" + dodir "/etc/${PN}" insinto "/etc/${PN}" doins dendrite-sample.yaml diff --git a/net-im/dendrite/files/dendrite.initd b/net-im/dendrite/files/dendrite.initd index eeede66..d6e1e94 100644 --- a/net-im/dendrite/files/dendrite.initd +++ b/net-im/dendrite/files/dendrite.initd @@ -4,16 +4,16 @@ DENDRITE_USER="${DENDRITE_USER:-dendrite}" DENDRITE_GROUP="${DENDRITE_GROUP:-dendrite}" -DENDRITE_CONFIG="${DENDRITE_CONFIG:-/etc/dendrite/config.yml}" +DENDRITE_CONFIG="${DENDRITE_CONFIG:-/etc/dendrite/dendrite.yml}" DENDRITE_DATA_DIR="${DENDRITE_DATA_DIR:-/var/lib/dendrite}" DENDRITE_LOG_DIR="${DENDRITE_LOG_DIR:-/var/log/dendrite}" command="/usr/bin/dendrite" -command_args="--config ${DENDRITE_CONFIG}" +command_args="-config ${DENDRITE_CONFIG} -logtostderr" pidfile="/run/${RC_SVCNAME}.pid" command_background="true" -start_stop_daemon_args="--user=\"${DENDRITE_USER}\" --group=\"${DENDRITE_GROUP}\" --stdout ${DENDRITE_LOG_DIR}/dendrite.log --stderr ${DENDRITE_LOG_DIR}/dendrite.err" +start_stop_daemon_args="--cd=\"${DENDRITE_DATA_DIR}\" --user=\"${DENDRITE_USER}\" --group=\"${DENDRITE_GROUP}\" --stdout ${DENDRITE_LOG_DIR}/dendrite.log --stderr ${DENDRITE_LOG_DIR}/dendrite.err" start_pre() { checkpath -d -o "${DENDRITE_USER}" -m750 "${DENDRITE_DATA_DIR}"