From d87c21306ee7b6731a0ebd6b312867b0d4b75310 Mon Sep 17 00:00:00 2001 From: Chris Vogel Date: Fri, 31 May 2024 08:47:58 +0200 Subject: [PATCH 1/4] Update manifest.toml changes about artifact-expiry triggered a rebuild https://gitlab.com/famedly/conduit/-/commit/13ae7a7e4633370941b73c3a65f5969f42756ec1 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 771e0f7..ce6c101 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Conduit" description.en = "Simple, fast and reliable chat server powered by Matrix" description.fr = "Serveur de chat simple, rapide et fiable alimenté par Matrix" -version = "0.7.0~ynh2" +version = "0.7.0~ynh3" maintainers = [] @@ -63,9 +63,9 @@ ram.runtime = "50M" extract = false rename = "conduit" amd64.url = "https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/master/raw/x86_64-unknown-linux-musl?job=artifacts" - amd64.sha256 = "eafa400feefee2a2117d56a09c891d0c39cbec30520a2422056d7d2dcd00de04" + amd64.sha256 = "cd40c61b819727687eca827b703aac72b3a2535337896a38dbcea79111c183d5" arm64.url = "https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/master/raw/aarch64-unknown-linux-musl?job=artifacts" - arm64.sha256 = "371a6572c370f82810e41666fe71bdacfd7b611b245310d6465392e9da7c3130" + arm64.sha256 = "d61879fa4d8075e8829934d45cbce83ba7aa1949fd97decf6f6261077211428c" [resources.system_user] From 7bf0bb37553e69d3310f238f195471fae4de3a42 Mon Sep 17 00:00:00 2001 From: Chris Vogel Date: Fri, 31 May 2024 09:35:29 +0200 Subject: [PATCH 2/4] Create ADMIN.md renamed [Admin.md to ADMIN.md](https://yunohost.org/en/packaging_app_doc#specific-notes-for-admins) and added information about registration/login. --- doc/ADMIN.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/ADMIN.md diff --git a/doc/ADMIN.md b/doc/ADMIN.md new file mode 100644 index 0000000..4e1d262 --- /dev/null +++ b/doc/ADMIN.md @@ -0,0 +1,20 @@ +### Login to conduit + +[Integration into the yunohost user database is not ready, yet.](https://github.com/YunoHost-Apps/conduit_ynh/issues/12) You need to **enable registration** in the apps configuration tab and then use a client to register an account. Afterwards you can disable registration again if you do not want allow anybody to register. + +Using the newly created account you should be able to login. + +### Coturn configuration + +To be able to take advantage of audio and video call functionalities, a coturn server is often required. It is possible to [install a coturn server in YunoHost (https://github.com/YunoHost-Apps/coturn-ynh/blob/master/README-en.md). +It is then necessary to fill in the information provided by the coturn server in the file 'conduit.toml' such as: + +``` +turn_uris = ["turns:your.turn.url:5349?transport=udp", "turns:your.turn.url:5349?transport=tcp"] +turn_username = "" +turn_password = "" +``` +If your coturn (not Yunohost's one) don't use TLS, you might need to change a little bit like : +``` +turn_uris = ["turn:your.turn.url:5349?transport=udp", "turn:your.turn.url:5349?transport=tcp"] +`` From 704c9820e51b6b417cc01f5f809570927056c086 Mon Sep 17 00:00:00 2001 From: Romain Date: Fri, 21 Jun 2024 16:44:14 +0200 Subject: [PATCH 3/4] bug fix correct artefacts hashes in manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 42d206e..32683d2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -63,10 +63,10 @@ ram.runtime = "50M" extract = false rename = "conduit" amd64.url = "https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/x86_64-unknown-linux-musl?job=artifacts" - amd64.sha256 = "b8971d19469d44b732af8d78cb856d9203ee72f8812091b129fe093d2a0231c9" + amd64.sha256 = "c5c21df55ec6159626cc158b1eae051c2572da8eb55a1e39a68c7fd38a11d7d3" arm64.url = "https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/next/raw/aarch64-unknown-linux-musl?job=artifacts" - arm64.sha256 = "e194debbb9dde3d403eecf5974e4ec2e2de21e3289f60bc512b34a2282d83edf" + arm64.sha256 = "61502ecb0ebd76e2b9648b523370299cec54f0dd38334e439267d36e7b8ee54b" [resources.system_user] From efde3686b10ab78e22c824d2cdc7fd7bee05bc86 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 23 Jun 2024 18:16:12 +0200 Subject: [PATCH 4/4] Apply suggestions from code review Co-authored-by: eric_G <46165813+ericgaspar@users.noreply.github.com> --- doc/ADMIN.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 4e1d262..f06d32d 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,20 +1,20 @@ -### Login to conduit +### Login to Conduit -[Integration into the yunohost user database is not ready, yet.](https://github.com/YunoHost-Apps/conduit_ynh/issues/12) You need to **enable registration** in the apps configuration tab and then use a client to register an account. Afterwards you can disable registration again if you do not want allow anybody to register. +[Integration into the YunoHost user database is not ready, yet.](https://github.com/YunoHost-Apps/conduit_ynh/issues/12) You need to **enable registration** in the apps configuration tab and then use a client to register an account. Afterwards you can disable registration again if you do not want allow anybody to register. Using the newly created account you should be able to login. ### Coturn configuration -To be able to take advantage of audio and video call functionalities, a coturn server is often required. It is possible to [install a coturn server in YunoHost (https://github.com/YunoHost-Apps/coturn-ynh/blob/master/README-en.md). -It is then necessary to fill in the information provided by the coturn server in the file 'conduit.toml' such as: +To be able to take advantage of audio and video call functionalities, a Coturn server is often required. It is possible to [install a Coturn server in YunoHost (https://github.com/YunoHost-Apps/coturn-ynh/blob/master/README-en.md). +It is then necessary to fill in the information provided by the Coturn server in the file 'conduit.toml' such as: ``` turn_uris = ["turns:your.turn.url:5349?transport=udp", "turns:your.turn.url:5349?transport=tcp"] turn_username = "" turn_password = "" ``` -If your coturn (not Yunohost's one) don't use TLS, you might need to change a little bit like : +If your Coturn (not YunoHost's one) does not use TLS, you might need to change a little bit like: ``` turn_uris = ["turn:your.turn.url:5349?transport=udp", "turn:your.turn.url:5349?transport=tcp"] ``