net-im/mautrix-*: update postinst, config

Signed-off-by: Julien Roy <julien@jroy.ca>

5 files changed, 31 insertions, 23 deletions

diff --git a/net-im/heisenbridge/heisenbridge-1.14.1.ebuild b/net-im/heisenbridge/heisenbridge-1.14.1.ebuild
index 266f403..cc4a9a2 100644
--- a/net-im/heisenbridge/heisenbridge-1.14.1.ebuild
+++ b/net-im/heisenbridge/heisenbridge-1.14.1.ebuild
@@ -52,7 +52,7 @@ pkg_postinst() {
 	elog "/usr/bin/python -m ${PN} -c /var/lib/${PN}/registration.yaml --generate-compat https://example.com"
 	elog "Notice the URL at the end, replace it with your homeserver's URL"
 	elog "Then, you must register the bridge with your homeserver"
-	elog "Refer to your homeserver's documentation for instruction"
+	elog "Refer to your homeserver's documentation for instructions"
 	elog "The registration file is located at /var/lib/${PN}/registration.yaml"
 	elog "Finally, you may start the ${PN} daemon"
 	einfo
diff --git a/net-im/mautrix-facebook/mautrix-facebook-0.4.1.ebuild b/net-im/mautrix-facebook/mautrix-facebook-0.4.1.ebuild
index 01fac40..2a7c8c8 100644
--- a/net-im/mautrix-facebook/mautrix-facebook-0.4.1.ebuild
+++ b/net-im/mautrix-facebook/mautrix-facebook-0.4.1.ebuild
@@ -55,18 +55,22 @@ src_install() {
 }
 
 pkg_postinst() {
+	optfeature "Prometheus statistics" dev-python/prometheus_client
+	optfeature "Sqlite backend" dev-python/aiosqlite
+
 	einfo
-	elog "Before you can use ${PN}, you must configure it correctly."
+	elog ""
+	elog "Before you can use ${PN}, you must configure it correctly"
 	elog "The configuration file is located at \"/etc/mautrix/${PN/-/_}.yaml\""
-	elog "Next, you must generate a registration file using the following command"
-	elog "sudo -u ${PN} /usr/bin/python -m ${PN/-/_} -c /etc/mautrix/${PN}.yaml g"
-	elog "Next, you must register you registration.yaml file with your homeserver"
-	elog "Then you must launch ${PN} by specifying the registration file"
-	elog "sudo -u ${PN} /usr/bin/python -m ${PN/-/_} -r registration.yaml"
-	elog "After this you can register the bridge with your homeserver"
-	elog "Finally, you can start the ${PN} daemon"
+	elog "When done, run the following command: emerge --config ${PN}"
+	elog "Then, you must register the bridge with your homeserver"
+	elog "Refer to your homeserver's documentation for instructions"
+	elog "The registration file is located at /var/lib/${PN/-/\/}/registration.yaml"
+	elog "Finally, you may start the ${PN} daemon"
 	einfo
+}
 
-	optfeature "Prometheus statistics" dev-python/prometheus_client
-	optfeature "Sqlite backend" dev-python/aiosqlite
+pkg_config() {
+	su - "${PN}" -s /bin/sh -c \
+	   "/usr/bin/python -m \"${PN/-/_}\" -c \"/etc/mautrix/${PN}.yaml -g /var/lib/${PN/-/\/}/registration.yaml\""
 }
diff --git a/net-im/mautrix-telegram/files/mautrix-telegram.initd b/net-im/mautrix-telegram/files/mautrix-telegram.initd
index f83b9f9..7657bde 100644
--- a/net-im/mautrix-telegram/files/mautrix-telegram.initd
+++ b/net-im/mautrix-telegram/files/mautrix-telegram.initd
@@ -8,6 +8,6 @@ module="mautrix_telegram"
 
 pidfile="/run/${RC_SVCNAME}.pid"
 command="/usr/bin/python"
-command_args="-m ${module} -c /etc/mautrix/${module}.yaml"
+command_args="-m ${module} -c /etc/mautrix/${module}.yaml -r /var/lib/mautrix/telegram/registration.yaml"
 command_background=true
 command_user="mautrix-telegram:mautrix"
diff --git a/net-im/mautrix-telegram/files/mautrix-telegram.unit b/net-im/mautrix-telegram/files/mautrix-telegram.unit
index e85ed7e..0c50824 100644
--- a/net-im/mautrix-telegram/files/mautrix-telegram.unit
+++ b/net-im/mautrix-telegram/files/mautrix-telegram.unit
@@ -6,7 +6,7 @@ After=network.target
 User=mautrix-telegram
 Group=mautrix
 Restart=always
-ExecStart=/usr/bin/python -m mautrix_telegram -c /etc/mautrix/mautrix_telegram.yaml
+ExecStart=/usr/bin/python -m mautrix_telegram -c /etc/mautrix/mautrix_telegram.yaml -r /var/lib/mautrix/telegram/registration.yaml
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/net-im/mautrix-telegram/mautrix-telegram-0.12.2_p20230118.ebuild b/net-im/mautrix-telegram/mautrix-telegram-0.12.2_p20230118.ebuild
index 90a8db4..bb6e757 100644
--- a/net-im/mautrix-telegram/mautrix-telegram-0.12.2_p20230118.ebuild
+++ b/net-im/mautrix-telegram/mautrix-telegram-0.12.2_p20230118.ebuild
@@ -60,18 +60,22 @@ src_install() {
 }
 
 pkg_postinst() {
+	optfeature "Prometheus statistics" dev-python/prometheus_client
+	optfeature "Sqlite backend" dev-python/aiosqlite
+
 	einfo
-	elog "Before you can use ${PN}, you must configure it correctly."
+	elog ""
+	elog "Before you can use ${PN}, you must configure it correctly"
 	elog "The configuration file is located at \"/etc/mautrix/${PN/-/_}.yaml\""
-	elog "Next, you must generate a registration file using the following command"
-	elog "sudo -u ${PN} /usr/bin/python -m ${PN/-/_} -c /etc/mautrix/${PN}.yaml g"
-	elog "Next, you must register you registration.yaml file with your homeserver"
-	elog "Then you must launch ${PN} by specifying the registration file"
-	elog "sudo -u ${PN} /usr/bin/python -m ${PN/-/_} -r registration.yaml"
-	elog "After this you can register the bridge with your homeserver"
-	elog "Finally, you can start the ${PN} daemon"
+	elog "When done, run the following command: emerge --config ${PN}"
+	elog "Then, you must register the bridge with your homeserver"
+	elog "Refer your homeserver's documentation for instructions"
+	elog "The registration file is located at /var/lib/${PN/-/\/}/registration.yaml"
+	elog "Finally, you may start the ${PN} daemon"
 	einfo
+}
 
-	optfeature "Prometheus statistics" dev-python/prometheus_client
-	optfeature "Sqlite backend" dev-python/aiosqlite
+pkg_config() {
+	su - "${PN}" -s /bin/sh -c \
+	   "/usr/bin/python -m \"${PN/-/_}\" -c \"/etc/mautrix/${PN}.yaml -g /var/lib/${PN/-/\/}/registration.yaml\""
 }