From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7370215800F for ; Sat, 21 Jan 2023 21:25:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94EFEE07DB; Sat, 21 Jan 2023 21:25:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A165E07DB for ; Sat, 21 Jan 2023 21:25:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 62B12335D92 for ; Sat, 21 Jan 2023 21:25:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E02F17F2 for ; Sat, 21 Jan 2023 21:25:44 +0000 (UTC) From: "Julien Roy" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Julien Roy" Message-ID: <1674336288.81e2af0cab395129277ee53e7a3371f25351154d.julien@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-im/conduit/files/, net-im/conduit/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-im/conduit/conduit-0.5.0.ebuild net-im/conduit/files/conduit.confd net-im/conduit/files/conduit.initd net-im/conduit/files/conduit.service net-im/conduit/files/conduit.unit X-VCS-Directories: net-im/conduit/files/ net-im/conduit/ X-VCS-Committer: julien X-VCS-Committer-Name: Julien Roy X-VCS-Revision: 81e2af0cab395129277ee53e7a3371f25351154d X-VCS-Branch: dev Date: Sat, 21 Jan 2023 21:25:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 61dbb155-d9d5-48c0-8150-79b07ed0de2d X-Archives-Hash: a07c7d568659a594044eb55396085f09 commit: 81e2af0cab395129277ee53e7a3371f25351154d Author: Julien Roy jroy ca> AuthorDate: Sat Jan 21 21:24:48 2023 +0000 Commit: Julien Roy jroy ca> CommitDate: Sat Jan 21 21:24:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=81e2af0c net-im/conduit: improve systemd unit Signed-off-by: Julien Roy jroy.ca> net-im/conduit/conduit-0.5.0.ebuild | 2 +- net-im/conduit/files/conduit.confd | 2 +- net-im/conduit/files/conduit.initd | 2 ++ net-im/conduit/files/{conduit.unit => conduit.service} | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/net-im/conduit/conduit-0.5.0.ebuild b/net-im/conduit/conduit-0.5.0.ebuild index d83820009..a543cd4e3 100644 --- a/net-im/conduit/conduit-0.5.0.ebuild +++ b/net-im/conduit/conduit-0.5.0.ebuild @@ -746,5 +746,5 @@ src_install() { doins "${FILESDIR}/conduit.toml" newinitd "${FILESDIR}/conduit.initd" "conduit" newconfd "${FILESDIR}/conduit.confd" "conduit" - systemd_newunit "${FILESDIR}/conduit.unit" "conduit.service" + systemd_dounit "${FILESDIR}/conduit.service" } diff --git a/net-im/conduit/files/conduit.confd b/net-im/conduit/files/conduit.confd index 98c240546..2c15be51a 100644 --- a/net-im/conduit/files/conduit.confd +++ b/net-im/conduit/files/conduit.confd @@ -1,2 +1,2 @@ # Configuration file for conduit -export CONDUIT_CONFIG=/etc/conduit/conduit.toml +CONDUIT_CONFIG=/etc/conduit/conduit.toml diff --git a/net-im/conduit/files/conduit.initd b/net-im/conduit/files/conduit.initd index dd89fcd6f..7ddb12a97 100644 --- a/net-im/conduit/files/conduit.initd +++ b/net-im/conduit/files/conduit.initd @@ -1,5 +1,7 @@ #!/sbin/openrc-run +export CONDUIT_CONFIG=${CONDUIT_CONFIG:/etc/config/conduit.toml} + command="/usr/bin/conduit" command_user="conduit:conduit" command_background=true diff --git a/net-im/conduit/files/conduit.unit b/net-im/conduit/files/conduit.service similarity index 65% rename from net-im/conduit/files/conduit.unit rename to net-im/conduit/files/conduit.service index 654f32f62..f7238645d 100644 --- a/net-im/conduit/files/conduit.unit +++ b/net-im/conduit/files/conduit.service @@ -3,7 +3,7 @@ Description=Conduit Matrix Server After=network.target [Service] -Environment="CONDUIT_CONFIG=/etc/conduit/conduit.toml" +EnvironmentFile=/etc/conf.d/conduit User=conduit Group=conduit Restart=always