From 52defb5b9f00c38dab835ec8679925c980ea806d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 20 Dec 2023 11:06:44 +0000 Subject: [PATCH 1/7] Auto-update README --- README.md | 73 +++++++++++++++++++++++++++++----------------------- README_fr.md | 50 +++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 32 deletions(-) create mode 100644 README_fr.md diff --git a/README.md b/README.md index b5c01f8..9d87227 100644 --- a/README.md +++ b/README.md @@ -1,41 +1,50 @@ -# Cjdns for Yunohost + -This is a cjdns app for yunohost. +# Cjdns for YunoHost + +[![Integration level](https://dash.yunohost.org/integration/cjdns.svg)](https://dash.yunohost.org/appci/app/cjdns) ![Working status](https://ci-apps.yunohost.org/ci/badges/cjdns.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/cjdns.maintain.svg) + +[![Install Cjdns with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cjdns) + +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allows you to install Cjdns quickly and simply on a YunoHost server. +If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* + +## Overview -## cjdns Networking Reinvented + Cjdns implements an encrypted IPv6 network using public-key cryptography for address allocation and a distributed hash table for routing. This provides near-zero-configuration networking, and prevents many of the security and scalability issues that plague existing networks. -https://github.com/cjdelisle/cjdns +https://github.com/cjdelisle/cjdns/ +**Shipped version:** 22.7 -# Setup your website on cjdns network +## Screenshots -1. Install Yunohost by following the detailed instructions provided [here](link-to-instructions). -2. Once the installation is complete, log in as an administrator at `yunohost.local`. Perform a system update, which may take some time. -3. Return to `yunohost.local` after the update and navigate to the Applications menu. Click on Install, search for "wordpress," select it, and proceed with the installation. -4. In the Applications menu, search for "cjdns" and install it. If it does not appear due to not being published yet. You can sideload it by pasting the following URL: `https://github.com/dkoukoul/cjdns_ynh` into the "Install custom app" section. -5. Obtain your cjdns IPv6 address by navigating to Tools -> Logs -> Click on "Install the 'cjdns' app." Your IPv6 address should be displayed in the log. -6. Reboot your Yunohost server to make the tun device available. Navigate to Tools->Shutdown and click Reboot. -7. Navigate to Tools -> Yunohost Settings -> Security, and under NGINX, disable "Force HTTPS." Click Save to apply the changes. -8. Edit `/etc/nginx/conf.d/[your-domain].conf`, add your cjdns-ipv6 to the list of `server_name`. -9. Finally, to allow public access for cjdns requests to your new wordpress site you can do the following: - 1. SSH into your yunohost server - 2. Copy current sso configuration file to persistent: `cp /etc/ssowat/conf.json /etc/ssowat/conf.json.persistent` - 3. Then edit the persistent file: `nano /etc/ssowat/conf.json.persistent` - 4. Change `public` to `true` and add this line under the `wordpress.main uris` section: `"re:^.fc.*"`. Remember to add a trailing “,” to the above entry. For example: +![Screenshot of Cjdns](./doc/screenshots/screenshot.png) -```json -"wordpress.main": { - "auth_header": true, - "label": "WordPress", - "public": true, - "show_tile": true, - "uris": [ - "example.nohost.me/blog", - "re:^.fc.*" - ], - "use_remote_user_var_in_nginx_conf": false, - "users": [] -} -`````` +## Documentation and resources + +* Official app website: +* Upstream app code repository: +* YunoHost Store: +* Report a bug: + +## Developer info + +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/cjdns_ynh/tree/testing). + +To try the testing branch, please proceed like that. + +``` bash +sudo yunohost app install https://github.com/YunoHost-Apps/cjdns_ynh/tree/testing --debug +or +sudo yunohost app upgrade cjdns -u https://github.com/YunoHost-Apps/cjdns_ynh/tree/testing --debug +``` + +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..25ea495 --- /dev/null +++ b/README_fr.md @@ -0,0 +1,50 @@ + + +# Cjdns pour YunoHost + +[![Niveau d’intégration](https://dash.yunohost.org/integration/cjdns.svg)](https://dash.yunohost.org/appci/app/cjdns) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/cjdns.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/cjdns.maintain.svg) + +[![Installer Cjdns avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cjdns) + +*[Read this readme in english.](./README.md)* + +> *Ce package vous permet d’installer Cjdns rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* + +## Vue d’ensemble + +Networking Reinvented + +Cjdns implements an encrypted IPv6 network using public-key cryptography for address allocation and a distributed hash table for routing. This provides near-zero-configuration networking, and prevents many of the security and scalability issues that plague existing networks. + +https://github.com/cjdelisle/cjdns/ + +**Version incluse :** 22.7 + +## Captures d’écran + +![Capture d’écran de Cjdns](./doc/screenshots/screenshot.png) + +## Documentations et ressources + +* Site officiel de l’app : +* Dépôt de code officiel de l’app : +* YunoHost Store: +* Signaler un bug : + +## Informations pour les développeurs + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/cjdns_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. + +``` bash +sudo yunohost app install https://github.com/YunoHost-Apps/cjdns_ynh/tree/testing --debug +ou +sudo yunohost app upgrade cjdns -u https://github.com/YunoHost-Apps/cjdns_ynh/tree/testing --debug +``` + +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From e6eefafc8360719c3d749efd1a9d9856b8d10b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 12:10:36 +0100 Subject: [PATCH 2/7] cleaning --- README.md => doc/Admin.md | 11 ----------- doc/DESCRIPTION.md | 4 ---- doc/DESCRIPTION_fr.md | 1 + manifest.toml | 10 +++++++--- 4 files changed, 8 insertions(+), 18 deletions(-) rename README.md => doc/Admin.md (83%) create mode 100644 doc/DESCRIPTION_fr.md diff --git a/README.md b/doc/Admin.md similarity index 83% rename from README.md rename to doc/Admin.md index b5c01f8..4acfc9c 100644 --- a/README.md +++ b/doc/Admin.md @@ -1,14 +1,3 @@ -# Cjdns for Yunohost - -This is a cjdns app for yunohost. - -## cjdns -Networking Reinvented -Cjdns implements an encrypted IPv6 network using public-key cryptography for address allocation and a distributed hash table for routing. This provides near-zero-configuration networking, and prevents many of the security and scalability issues that plague existing networks. - -https://github.com/cjdelisle/cjdns - - # Setup your website on cjdns network 1. Install Yunohost by following the detailed instructions provided [here](link-to-instructions). diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 9cc83d6..e0a2575 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,5 +1 @@ -Networking Reinvented - Cjdns implements an encrypted IPv6 network using public-key cryptography for address allocation and a distributed hash table for routing. This provides near-zero-configuration networking, and prevents many of the security and scalability issues that plague existing networks. - -https://github.com/cjdelisle/cjdns/ \ No newline at end of file diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..96ee2f0 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1 @@ +Cjdns implémente un réseau IPv6 crypté utilisant une cryptographie à clé publique pour l'attribution des adresses et une table de hachage distribuée pour le routage. Cela fournit une configuration réseau proche de zéro et évite de nombreux problèmes de sécurité et d'évolutivité qui affectent les réseaux existants. \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index fc50aff..658b6ba 100644 --- a/manifest.toml +++ b/manifest.toml @@ -2,9 +2,10 @@ packaging_format = 2 id = "cjdns" name = "Cjdns" -description = "Cjdns encrypted IPv6 network" +description.en = "Encrypted IPv6 network" +description.fr = "Réseau IPv6 chiffré" -version = "22.7" +version = "22.7~ynh1" maintainers = ["dkoukoul"] @@ -14,11 +15,14 @@ website = "https://github.com/cjdelisle/cjdns/" code = "https://github.com/cjdelisle/cjdns/" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = ["amd64","arm64"] multi_instance = false + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" From e4a88eb4842de5cf0e3b4db70fb3e96af5206a55 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 20 Dec 2023 11:11:02 +0000 Subject: [PATCH 3/7] Auto-update README --- README.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 8 ++------ 2 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..97b59a3 --- /dev/null +++ b/README.md @@ -0,0 +1,47 @@ + + +# Cjdns for YunoHost + +[![Integration level](https://dash.yunohost.org/integration/cjdns.svg)](https://dash.yunohost.org/appci/app/cjdns) ![Working status](https://ci-apps.yunohost.org/ci/badges/cjdns.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/cjdns.maintain.svg) + +[![Install Cjdns with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cjdns) + +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allows you to install Cjdns quickly and simply on a YunoHost server. +If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* + +## Overview + +Cjdns implements an encrypted IPv6 network using public-key cryptography for address allocation and a distributed hash table for routing. This provides near-zero-configuration networking, and prevents many of the security and scalability issues that plague existing networks. + + +**Shipped version:** 22.7~ynh1 + +## Screenshots + +![Screenshot of Cjdns](./doc/screenshots/screenshot.png) + +## Documentation and resources + +* Official app website: +* Upstream app code repository: +* YunoHost Store: +* Report a bug: + +## Developer info + +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/cjdns_ynh/tree/testing). + +To try the testing branch, please proceed like that. + +``` bash +sudo yunohost app install https://github.com/YunoHost-Apps/cjdns_ynh/tree/testing --debug +or +sudo yunohost app upgrade cjdns -u https://github.com/YunoHost-Apps/cjdns_ynh/tree/testing --debug +``` + +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 25ea495..fc4b821 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,13 +16,9 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Networking Reinvented +Cjdns implémente un réseau IPv6 crypté utilisant une cryptographie à clé publique pour l'attribution des adresses et une table de hachage distribuée pour le routage. Cela fournit une configuration réseau proche de zéro et évite de nombreux problèmes de sécurité et d'évolutivité qui affectent les réseaux existants. -Cjdns implements an encrypted IPv6 network using public-key cryptography for address allocation and a distributed hash table for routing. This provides near-zero-configuration networking, and prevents many of the security and scalability issues that plague existing networks. - -https://github.com/cjdelisle/cjdns/ - -**Version incluse :** 22.7 +**Version incluse :** 22.7~ynh1 ## Captures d’écran From 118535973e72bdc287a4a220cbb435143075af40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 12:13:00 +0100 Subject: [PATCH 4/7] Create tests.toml --- tests.toml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 tests.toml diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..91daf17 --- /dev/null +++ b/tests.toml @@ -0,0 +1,7 @@ +test_format = 1.0 + +[default] + + # ------------ + # Tests to run + # ------------ \ No newline at end of file From bed3d805b9c284948f38a24e38c39bcc322bc56a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 12:14:14 +0100 Subject: [PATCH 5/7] cleaning --- scripts/install | 2 ++ scripts/remove | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 781f468..cd4ee5c 100755 --- a/scripts/install +++ b/scripts/install @@ -79,6 +79,7 @@ ynh_add_systemd_config # Use logrotate to manage application logfile(s) ynh_use_logrotate + #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= @@ -96,6 +97,7 @@ ynh_script_progression --message="Launching cjdns service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" ynh_script_progression --message="Your cjdns IPv6: $cjdns_ipv6" --weight=1 + #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/remove b/scripts/remove index 9d93abc..f6ffecb 100755 --- a/scripts/remove +++ b/scripts/remove @@ -17,8 +17,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 -# This should be a symetric version of what happens in the install script - # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then @@ -38,6 +36,7 @@ killall cjdroute # Remove other various files specific to the app... such as : ynh_secure_remove --file="/var/log/$app" ynh_secure_remove --file="$install_dir" + #================================================= # END OF SCRIPT #================================================= From 01dfdce84ac04512d89e8e40b9d10c5d482f31bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 12:28:42 +0100 Subject: [PATCH 6/7] Update manifest.toml --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 658b6ba..27e9948 100644 --- a/manifest.toml +++ b/manifest.toml @@ -11,7 +11,6 @@ maintainers = ["dkoukoul"] [upstream] license = "GPL-3.0" -website = "https://github.com/cjdelisle/cjdns/" code = "https://github.com/cjdelisle/cjdns/" [integration] From 20d20e6ca8a511808ab048f80b30e47b66f4c9b2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 20 Dec 2023 11:28:46 +0000 Subject: [PATCH 7/7] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 97b59a3..6bf0564 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,6 @@ Cjdns implements an encrypted IPv6 network using public-key cryptography for add ## Documentation and resources -* Official app website: * Upstream app code repository: * YunoHost Store: * Report a bug: diff --git a/README_fr.md b/README_fr.md index fc4b821..a33f5f2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,6 @@ Cjdns implémente un réseau IPv6 crypté utilisant une cryptographie à clé pu ## Documentations et ressources -* Site officiel de l’app : * Dépôt de code officiel de l’app : * YunoHost Store: * Signaler un bug :