From cd023365895dfbc7314251fbc7132946a8bf3691 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 8 Feb 2024 20:36:57 +0100 Subject: [PATCH 1/8] fix line breaks --- doc/POST_INSTALL.md | 8 ++++---- doc/POST_INSTALL_fr.md | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index a17a8cb..4eea33a 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1,6 +1,6 @@ Credentials to use in RustDesk client Settings -> Network -ID Server: __DOMAIN__ -Relay Server: __DOMAIN__ -API Server: https://__DOMAIN__ -The key can be found here: __INSTALL_DIR__/id_ed25519.pub \ No newline at end of file +ID Server: __DOMAIN__ +Relay Server: __DOMAIN__ +API Server: https://__DOMAIN__ +The key can be found here: __INSTALL_DIR__/id_ed25519.pub diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md index 8672231..64ea338 100644 --- a/doc/POST_INSTALL_fr.md +++ b/doc/POST_INSTALL_fr.md @@ -1,6 +1,6 @@ Informations d'identification à utiliser dans le client RustDesk sous Paramètres -> Réseau -Serveur ID : __DOMAIN__ -Serveur relais : __DOMAIN__ -Serveur API : https://__DOMAIN__ -La clé peut être trouvée ici: __INSTALL_DIR__/id_ed25519.pub \ No newline at end of file +Serveur ID : __DOMAIN__ +Serveur relais : __DOMAIN__ +Serveur API : https://__DOMAIN__ +La clé peut être trouvée ici: __INSTALL_DIR__/id_ed25519.pub From 830f5f60012ffd75b260c1556262c07d3cf4d57f Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 8 Feb 2024 20:37:26 +0100 Subject: [PATCH 2/8] fix line breaks 2 x) --- doc/ADMIN.md | 8 ++++---- doc/ADMIN_fr.md | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 2d8e0c3..eb0a831 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,6 +1,6 @@ Credentials to use in RustDesk client Settings -> Network -ID Server: __DOMAIN__ -Relay Server: __DOMAIN__ -API Server: https://__DOMAIN__ -key: __KEY__ \ No newline at end of file +ID Server: __DOMAIN__ +Relay Server: __DOMAIN__ +API Server: https://__DOMAIN__ +key: __KEY__ diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index cd95a75..5608273 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -1,6 +1,6 @@ Informations d'identification à utiliser dans le client RustDesk sous Paramètres -> Réseau -Serveur ID : __DOMAIN__ -Serveur relais : __DOMAIN__ -Serveur API : https://__DOMAIN__ -Key : __KEY__ \ No newline at end of file +Serveur ID : __DOMAIN__ +Serveur relais : __DOMAIN__ +Serveur API : https://__DOMAIN__ +Key : __KEY__ From 242b23fc05a3b2669648395ea2c08b8b34f17473 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 8 Feb 2024 20:45:58 +0100 Subject: [PATCH 3/8] add i386 arch and fix autoupdate assets regex --- manifest.toml | 51 +++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/manifest.toml b/manifest.toml index db08ef6..7fb6bd0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -9,7 +9,7 @@ description.fr = "Alternative de contrôle à distance pour l'auto-hébergement" version = "1.1.9~ynh1" -maintainers = ["eric_G"] +maintainers = [ "eric_G" ] [upstream] license = "AGPL-3.0" @@ -41,37 +41,40 @@ ram.runtime = "50M" [resources.sources.main] amd64.url = "https://github.com/rustdesk/rustdesk-server/releases/download/1.1.9/rustdesk-server-linux-amd64.zip" amd64.sha256 = "c6db9a6bb81cb0ec5503e7bab6ac51a4c1135dcd6b1493ff0630dfce4fce29d1" + i386.url = "https://github.com/rustdesk/rustdesk-server/releases/download/1.1.9/rustdesk-server-linux-i386.zip" + i386.sha256 = "2e961e46676200f998442ad3a1a112b25a5383246a8c376bfc28188a1c94df27" arm64.url = "https://github.com/rustdesk/rustdesk-server/releases/download/1.1.9/rustdesk-server-linux-arm64v8.zip" arm64.sha256 = "30095ba2c1f9f7b783b442f7792630faa16e1645512270486db6fd9cce4e1368" armhf.url = "https://github.com/rustdesk/rustdesk-server/releases/download/1.1.9/rustdesk-server-linux-armv7.zip" armhf.sha256 = "4a3c7d1a17a2b5e1141c9bb4b2f64a17fb121c7d73fe075574ab77c9e7fab0d1" autoupdate.strategy = "latest_github_release" - autoupdate.asset.arm64 = "rustdesk-server-linux-arm64v8\\.zip" - autoupdate.asset.amd64 = "rustdesk-server-linux-amd64\\.zip" - autoupdate.asset.armhf = "rustdesk-server-linux-armv7\\.zip" + autoupdate.asset.amd64 = "rustdesk-server-linux-amd64.zip" + autoupdate.asset.i386 = "rustdesk-server-linux-i386.zip" + autoupdate.asset.arm64 = "rustdesk-server-linux-arm64v8.zip" + autoupdate.asset.armhf = "rustdesk-server-linux-armv7.zip" - [resources.system_user] +[resources.system_user] - [resources.install_dir] +[resources.install_dir] - [resources.permissions] - main.url = "/" - main.show_tile = false - main.allowed = "visitors" +[resources.permissions] +main.url = "/" +main.show_tile = false +main.allowed = "visitors" - [resources.ports] - api.default = 21114 - hbbs.default = 21115 - hbbs.exposed = "TCP" - hbbsbis.default = 21116 - hbbsbis.exposed = "Both" - hbbster.default = 21118 - hbbster.exposed = "TCP" - hbbr.default = 21117 - hbbr.exposed = "TCP" - hbbrbis.default = 21119 - hbbrbis.exposed = "TCP" +[resources.ports] +api.default = 21114 +hbbs.default = 21115 +hbbs.exposed = "TCP" +hbbsbis.default = 21116 +hbbsbis.exposed = "Both" +hbbster.default = 21118 +hbbster.exposed = "TCP" +hbbr.default = 21117 +hbbr.exposed = "TCP" +hbbrbis.default = 21119 +hbbrbis.exposed = "TCP" - [resources.apt] - packages = "sqlite3" +[resources.apt] +packages = "sqlite3" From db25efa022287baa24b571646e258057864164a5 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 8 Feb 2024 20:46:18 +0100 Subject: [PATCH 4/8] bump version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 7fb6bd0..2f4c8b9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "RustDesk Server" description.en = "Remote control alternative for self-hosting" description.fr = "Alternative de contrôle à distance pour l'auto-hébergement" -version = "1.1.9~ynh1" +version = "1.1.9~ynh2" maintainers = [ "eric_G" ] From 1fa9de263d9adaa44bc3d116e40e5c18fd7fc063 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 8 Feb 2024 19:46:26 +0000 Subject: [PATCH 5/8] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3c330de..400c42e 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Self-host your own RustDesk server. RustDesk is a full-featured open source remote control alternative for self-hosting and security with minimal configuration. -**Shipped version:** 1.1.9~ynh1 +**Shipped version:** 1.1.9~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 90da84b..cfe0697 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Auto-hébergez votre propre serveur RustDesk. RustDesk est une alternative de contrôle à distance open source complète pour l'auto-hébergement et la sécurité avec une configuration minimale. -**Version incluse :** 1.1.9~ynh1 +**Version incluse :** 1.1.9~ynh2 ## Captures d’écran From 1a78db4f56d1b867e94f536c15bc7e0155b38d3e Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 8 Feb 2024 20:48:17 +0100 Subject: [PATCH 6/8] add github templates --- .github/ISSUE_TEMPLATE.md | 60 ++++++++++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 16 +++++++++ 2 files changed, 76 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..5258376 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,60 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** + +1. *Read this whole template first.* +2. *Determine if you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *When in doubt, post here and we will figure it out together.* +3. *Delete the italic comments as you write over them below, and remove this guide.* + +--- + +### Describe the bug + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + + ```sh + sudo yunohost app install the_app + ``` + +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* + +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..496d9c2 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) From 34cf2a1f60064e2c328c40313ef46a90643056c8 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 8 Feb 2024 20:53:21 +0100 Subject: [PATCH 7/8] code quote the key --- doc/ADMIN.md | 2 +- doc/ADMIN_fr.md | 2 +- doc/POST_INSTALL.md | 2 +- doc/POST_INSTALL_fr.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index eb0a831..72a828c 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -3,4 +3,4 @@ Credentials to use in RustDesk client Settings -> Network ID Server: __DOMAIN__ Relay Server: __DOMAIN__ API Server: https://__DOMAIN__ -key: __KEY__ +Key: `__KEY__` diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 5608273..3679414 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -3,4 +3,4 @@ Informations d'identification à utiliser dans le client RustDesk sous Paramètr Serveur ID : __DOMAIN__ Serveur relais : __DOMAIN__ Serveur API : https://__DOMAIN__ -Key : __KEY__ +Key : `__KEY__` diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index 4eea33a..ca8f326 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -3,4 +3,4 @@ Credentials to use in RustDesk client Settings -> Network ID Server: __DOMAIN__ Relay Server: __DOMAIN__ API Server: https://__DOMAIN__ -The key can be found here: __INSTALL_DIR__/id_ed25519.pub +The key can be found here: `__INSTALL_DIR__/id_ed25519.pub` diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md index 64ea338..8a4c808 100644 --- a/doc/POST_INSTALL_fr.md +++ b/doc/POST_INSTALL_fr.md @@ -3,4 +3,4 @@ Informations d'identification à utiliser dans le client RustDesk sous Paramètr Serveur ID : __DOMAIN__ Serveur relais : __DOMAIN__ Serveur API : https://__DOMAIN__ -La clé peut être trouvée ici: __INSTALL_DIR__/id_ed25519.pub +La clé peut être trouvée ici: `__INSTALL_DIR__/id_ed25519.pub` From 689817f05845e1e629f1c49ddcbb1c222534a42c Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 8 Feb 2024 20:55:34 +0100 Subject: [PATCH 8/8] rafters the url --- doc/ADMIN.md | 2 +- doc/ADMIN_fr.md | 2 +- doc/POST_INSTALL.md | 2 +- doc/POST_INSTALL_fr.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 72a828c..abcd841 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -2,5 +2,5 @@ Credentials to use in RustDesk client Settings -> Network ID Server: __DOMAIN__ Relay Server: __DOMAIN__ -API Server: https://__DOMAIN__ +API Server: Key: `__KEY__` diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 3679414..837facb 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -2,5 +2,5 @@ Informations d'identification à utiliser dans le client RustDesk sous Paramètr Serveur ID : __DOMAIN__ Serveur relais : __DOMAIN__ -Serveur API : https://__DOMAIN__ +Serveur API : Key : `__KEY__` diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index ca8f326..f3bf225 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -2,5 +2,5 @@ Credentials to use in RustDesk client Settings -> Network ID Server: __DOMAIN__ Relay Server: __DOMAIN__ -API Server: https://__DOMAIN__ +API Server: The key can be found here: `__INSTALL_DIR__/id_ed25519.pub` diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md index 8a4c808..e122428 100644 --- a/doc/POST_INSTALL_fr.md +++ b/doc/POST_INSTALL_fr.md @@ -2,5 +2,5 @@ Informations d'identification à utiliser dans le client RustDesk sous Paramètr Serveur ID : __DOMAIN__ Serveur relais : __DOMAIN__ -Serveur API : https://__DOMAIN__ +Serveur API : La clé peut être trouvée ici: `__INSTALL_DIR__/id_ed25519.pub`