From e97bdb3e092a69e6a6bad0afedc83ea13d9b91a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 May 2024 09:15:23 +0200 Subject: [PATCH 01/13] cleaning --- doc/ADMIN.md | 2 +- scripts/install | 2 ++ scripts/remove | 1 - scripts/upgrade | 13 ++----------- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index b3b4ccc..a2bf58d 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -4,4 +4,4 @@ 2. 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. 3. Reboot your YunoHost server to make the tun device available. Navigate to Tools->Shutdown and click Reboot. 4. Navigate to Tools -> Yunohost Settings -> Security, and under NGINX, disable "Force HTTPS." Click Save to apply the changes. -5. Finally edit `/etc/nginx/conf.d/[your-domain].conf`, add your cjdns-ipv6 to the list of `server_name`. +5. Finally edit `/etc/nginx/conf.d/__DOMAIN__.conf`, add your cjdns-ipv6 to the list of `server_name`. diff --git a/scripts/install b/scripts/install index bec5528..48f3e62 100755 --- a/scripts/install +++ b/scripts/install @@ -24,6 +24,7 @@ chown -R $app:www-data "$install_dir" chmod +x "$install_dir/cjdroute" # mv $install_dir/cjdroute $data_dir/cjdroute + #================================================= # CONFIGURING CJDNS #================================================= @@ -38,6 +39,7 @@ jq '.noBackground = 1' $install_dir/cjdroute.conf > $install_dir/cjdroute.conf.t # UPGRADE PEERS #================================================= ynh_script_progression --message="Getting cjdns peers..." --weight=1 + # Fetch the JSON data json=$(curl -s -A "ynh" https://vpn.anode.co/api/0.4/vpn/cjdns/peeringlines/) echo "Got peering lines" diff --git a/scripts/remove b/scripts/remove index f6ffecb..2b596c5 100755 --- a/scripts/remove +++ b/scripts/remove @@ -9,7 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers - #================================================= # REMOVE SYSTEM CONFIGURATIONS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index d190780..11f7ddb 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,12 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -upgrade_type=$(ynh_check_app_version_changed) - -#================================================= -# STANDARD UPGRADE STEPS -#================================================= - #================================================= # STOP SYSTEMD SERVICE #================================================= @@ -27,12 +21,9 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Installing latest version..." --weight=1 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Installing latest version..." --weight=1 - ynh_setup_source --dest_dir="$install_dir" -fi +ynh_setup_source --dest_dir="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" From 5da5d2d3cfaa9b70c5de85d23ec2eb693c4cc4be Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 16 May 2024 07:15:29 +0000 Subject: [PATCH 02/13] Auto-update READMEs --- ALL_README.md | 3 +++ README_es.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ README_gl.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 141 insertions(+) create mode 100644 README_es.md create mode 100644 README_gl.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md index 3eeb161..8938aae 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,5 +1,8 @@ # All available README files by language - [Read the README in English](README.md) +- [Lee el README en español](README_es.md) - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..8436107 --- /dev/null +++ b/README_es.md @@ -0,0 +1,46 @@ + + +# Cjdns para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/cjdns.svg)](https://dash.yunohost.org/appci/app/cjdns) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/cjdns.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/cjdns.maintain.svg) + +[![Instalar Cjdns con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cjdns) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarCjdns rapidamente y simplement en un servidor YunoHost.* +> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.* + +## Descripción general + +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. + + +**Versión actual:** 22.7~ynh1 + +## Capturas + +![Captura de Cjdns](./doc/screenshots/screenshot.png) + +## Documentaciones y recursos + +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/cjdns_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/cjdns_ynh/tree/testing --debug +o +sudo yunohost app upgrade cjdns -u https://github.com/YunoHost-Apps/cjdns_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..eff4db9 --- /dev/null +++ b/README_gl.md @@ -0,0 +1,46 @@ + + +# Cjdns para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/cjdns.svg)](https://dash.yunohost.org/appci/app/cjdns) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/cjdns.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/cjdns.maintain.svg) + +[![Instalar Cjdns con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cjdns) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Cjdns de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +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. + + +**Versión proporcionada:** 22.7~ynh1 + +## Capturas de pantalla + +![Captura de pantalla de Cjdns](./doc/screenshots/screenshot.png) + +## Documentación e recursos + +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/cjdns_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```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 +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..5b04dbc --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,46 @@ + + +# YunoHost 上的 Cjdns + +[![集成程度](https://dash.yunohost.org/integration/cjdns.svg)](https://dash.yunohost.org/appci/app/cjdns) ![工作状态](https://ci-apps.yunohost.org/ci/badges/cjdns.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/cjdns.maintain.svg) + +[![使用 YunoHost 安装 Cjdns](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cjdns) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Cjdns。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +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. + + +**分发版本：** 22.7~ynh1 + +## 截图 + +![Cjdns 的截图](./doc/screenshots/screenshot.png) + +## 文档与资源 + +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/cjdns_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/cjdns_ynh/tree/testing --debug +或 +sudo yunohost app upgrade cjdns -u https://github.com/YunoHost-Apps/cjdns_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From ea50023ebd27f6b4ad04cefcf2bbeb97ff4344c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 May 2024 09:27:05 +0200 Subject: [PATCH 03/13] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 48f3e62..7b14f05 100755 --- a/scripts/install +++ b/scripts/install @@ -103,7 +103,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" # MAKE WORDPRESS AVAILABLE ON CJDNS #================================================= -yunohost tools shell -c "from yunohost.permission import permission_url; permission_url('wordpress.main', add_url=['re:^.fc.*'])" +#yunohost tools shell -c "from yunohost.permission import permission_url; permission_url('wordpress.main', add_url=['re:^.fc.*'])" #================================================= # END OF SCRIPT From 8603925c3310c920b248fc0293250ae750bafa40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 May 2024 09:35:42 +0200 Subject: [PATCH 04/13] Update install --- scripts/install | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 7b14f05..3e593c3 100755 --- a/scripts/install +++ b/scripts/install @@ -103,7 +103,9 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" # MAKE WORDPRESS AVAILABLE ON CJDNS #================================================= -#yunohost tools shell -c "from yunohost.permission import permission_url; permission_url('wordpress.main', add_url=['re:^.fc.*'])" +if [[ -z $(yunohost app list | grep -q 'id: wordpress') ]]; then + yunohost tools shell -c "from yunohost.permission import permission_url; permission_url('wordpress.main', add_url=['re:^.fc.*'])" +fi #================================================= # END OF SCRIPT From 27ed81da6f7ae8709b10c106bbe3610c2ebcdedc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 May 2024 09:36:38 +0200 Subject: [PATCH 05/13] Update systemd.service --- conf/systemd.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index c4357c4..6146792 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -3,8 +3,8 @@ Description=Cjdns: Encrypted IPv6 network After=network.target cjdns.service [Service] -User=root -Group=root +User=__APP__ +Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ ExecStart=/bin/bash -c '__INSTALL_DIR__/cjdroute < __INSTALL_DIR__/cjdroute.conf' KillMode=process From e5d58277df00796c298fb6598397d2675e44c1f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 May 2024 10:28:52 +0200 Subject: [PATCH 06/13] Update install --- scripts/install | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/scripts/install b/scripts/install index 3e593c3..b1394cc 100755 --- a/scripts/install +++ b/scripts/install @@ -23,12 +23,10 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" chmod +x "$install_dir/cjdroute" -# mv $install_dir/cjdroute $data_dir/cjdroute - #================================================= # CONFIGURING CJDNS #================================================= -ynh_script_progression --message="Configuring cjdns..." --weight=1 +ynh_script_progression --message="Configuring $app..." --weight=1 $install_dir/cjdroute --genconf | $install_dir/cjdroute --cleanconf > $install_dir/cjdroute.conf @@ -38,14 +36,14 @@ jq '.noBackground = 1' $install_dir/cjdroute.conf > $install_dir/cjdroute.conf.t #================================================= # UPGRADE PEERS #================================================= -ynh_script_progression --message="Getting cjdns peers..." --weight=1 +ynh_script_progression --message="Getting $app peers..." --weight=1 # Fetch the JSON data json=$(curl -s -A "ynh" https://vpn.anode.co/api/0.4/vpn/cjdns/peeringlines/) echo "Got peering lines" length=$(echo $json | jq '. | length') -ynh_script_progression --message="Adding $length cjdns peers..." --weight=1 +ynh_script_progression --message="Adding $length $app peers..." --weight=1 for (( i=0; i<$length; i++ )) do # Parse the JSON data @@ -74,7 +72,7 @@ ynh_app_setting_set --app=$app --key=cjdns_ipv6 --value=$cjdns_ipv6 #================================================= # SETUP SYSTEMD #================================================= -ynh_script_progression --message="Configuring cjdns systemd service..." +ynh_script_progression --message="Configuring systemd service..." # Create a dedicated systemd config ynh_add_systemd_config @@ -85,7 +83,7 @@ ynh_use_logrotate #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating cjdns service in YunoHost..." +ynh_script_progression --message="Integrating service in YunoHost..." yunohost service add $app --description="Encrypted IPv6 network" --log="/var/log/$app/$app.log" @@ -99,14 +97,6 @@ ynh_script_progression --message="Launching cjdns service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" -#================================================= -# MAKE WORDPRESS AVAILABLE ON CJDNS -#================================================= - -if [[ -z $(yunohost app list | grep -q 'id: wordpress') ]]; then - yunohost tools shell -c "from yunohost.permission import permission_url; permission_url('wordpress.main', add_url=['re:^.fc.*'])" -fi - #================================================= # END OF SCRIPT #================================================= From 5736f0b82017de86fdfe2ce659546fb89c89ff53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 May 2024 10:30:14 +0200 Subject: [PATCH 07/13] Update upgrade --- scripts/upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 11f7ddb..d97511b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." --weight=1 +ynh_script_progression --message="Stopping $app's systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" @@ -21,7 +21,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Installing latest version..." --weight=1 +ynh_script_progression --message="Updating $app's configuration files..." --weight=1 ynh_setup_source --dest_dir="$install_dir" @@ -39,7 +39,7 @@ yunohost service add $app --description="Encrypted IPv6 network" --log="/var/log #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Restarting cjdns service..." --weight=1 +ynh_script_progression --message="Starting $app's systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" From f470ce4365b0980d613fb5e209f1b2463a16367f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 May 2024 10:32:11 +0200 Subject: [PATCH 08/13] cleaning --- manifest.toml | 2 -- scripts/install | 13 +++---------- scripts/restore | 11 +---------- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/manifest.toml b/manifest.toml index 093d9f2..d59c3b1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -41,8 +41,6 @@ ram.runtime = "50M" [resources.system_user] [resources.install_dir] - - [resources.data_dir] [resources.ports] diff --git a/scripts/install b/scripts/install index b1394cc..97acc49 100755 --- a/scripts/install +++ b/scripts/install @@ -70,9 +70,9 @@ cjdns_ipv6=$(jq -r '.ipv6' < $install_dir/cjdroute.conf) ynh_app_setting_set --app=$app --key=cjdns_ipv6 --value=$cjdns_ipv6 #================================================= -# SETUP SYSTEMD +# APP INITIAL CONFIGURATION #================================================= -ynh_script_progression --message="Configuring systemd service..." +ynh_script_progression --message="Adding $app's configuration files..." --weight=1 # Create a dedicated systemd config ynh_add_systemd_config @@ -80,19 +80,12 @@ ynh_add_systemd_config # Use logrotate to manage application logfile(s) ynh_use_logrotate -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." - yunohost service add $app --description="Encrypted IPv6 network" --log="/var/log/$app/$app.log" -#================================================= -# GENERIC FINALIZATION #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Launching cjdns service..." --weight=1 +ynh_script_progression --message="Starting $app's systemd service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" diff --git a/scripts/restore b/scripts/restore index 9a91205..078501a 100755 --- a/scripts/restore +++ b/scripts/restore @@ -19,19 +19,10 @@ ynh_restore_file --origin_path="$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# RESTORE THE DATA DIRECTORY -#================================================= -ynh_script_progression --message="Restoring the data directory..." --weight=1 - -ynh_restore_file --origin_path="$data_dir" --not_mandatory - -# (Same as for install dir) -chown -R $app:www-data "$data_dir" - #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet From 2c86830972b0cdbff5d403d0cd50cca41225c59e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 May 2024 10:33:05 +0200 Subject: [PATCH 09/13] Update remove --- scripts/remove | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/remove b/scripts/remove index 2b596c5..0be0b59 100755 --- a/scripts/remove +++ b/scripts/remove @@ -25,16 +25,10 @@ fi ynh_remove_systemd_config -# ================================================= -# STOP AND REMOVE SERVICE -#================================================= -ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1 - killall cjdroute -# Remove other various files specific to the app... such as : +# Remove other various files specific to the app... ynh_secure_remove --file="/var/log/$app" -ynh_secure_remove --file="$install_dir" #================================================= # END OF SCRIPT From 9373d914081ad8fb2bcadac8b2527bc09537c828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 May 2024 10:35:29 +0200 Subject: [PATCH 10/13] fix --- manifest.toml | 2 +- scripts/restore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index d59c3b1..b614583 100644 --- a/manifest.toml +++ b/manifest.toml @@ -6,7 +6,7 @@ name = "Cjdns" description.en = "Encrypted IPv6 network" description.fr = "Réseau IPv6 chiffré" -version = "22.7~ynh1" +version = "22.7~ynh2" maintainers = ["dkoukoul"] diff --git a/scripts/restore b/scripts/restore index 078501a..bedb02b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -39,4 +39,4 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --last \ No newline at end of file +ynh_script_progression --message="Restoration completed for $app" --last From baf0abc648e0844964277c38562c8cf2d591cd6c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 16 May 2024 08:35:39 +0000 Subject: [PATCH 11/13] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6f5862f..008e60c 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ It shall NOT be edited by hand. 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 +**Shipped version:** 22.7~ynh2 ## Screenshots diff --git a/README_es.md b/README_es.md index 8436107..d670b4f 100644 --- a/README_es.md +++ b/README_es.md @@ -19,7 +19,7 @@ No se debe editar a mano. 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. -**Versión actual:** 22.7~ynh1 +**Versión actual:** 22.7~ynh2 ## Capturas diff --git a/README_eu.md b/README_eu.md index 1c00599..43f91e3 100644 --- a/README_eu.md +++ b/README_eu.md @@ -19,7 +19,7 @@ EZ editatu eskuz. 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. -**Paketatutako bertsioa:** 22.7~ynh1 +**Paketatutako bertsioa:** 22.7~ynh2 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index 384ca37..bda16ff 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. 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. -**Version incluse :** 22.7~ynh1 +**Version incluse :** 22.7~ynh2 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index eff4db9..58ed5ae 100644 --- a/README_gl.md +++ b/README_gl.md @@ -19,7 +19,7 @@ NON debe editarse manualmente. 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. -**Versión proporcionada:** 22.7~ynh1 +**Versión proporcionada:** 22.7~ynh2 ## Capturas de pantalla diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 5b04dbc..8defd8c 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -19,7 +19,7 @@ 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. -**分发版本：** 22.7~ynh1 +**分发版本：** 22.7~ynh2 ## 截图 From e66cf76e7460c544e9802b6b1022273e7d481541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 May 2024 10:40:24 +0200 Subject: [PATCH 12/13] Update systemd.service --- conf/systemd.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 6146792..c4357c4 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -3,8 +3,8 @@ Description=Cjdns: Encrypted IPv6 network After=network.target cjdns.service [Service] -User=__APP__ -Group=__APP__ +User=root +Group=root WorkingDirectory=__INSTALL_DIR__/ ExecStart=/bin/bash -c '__INSTALL_DIR__/cjdroute < __INSTALL_DIR__/cjdroute.conf' KillMode=process From 66caf1fca1eebcde77e3d0f445ffcc9e599ba986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 May 2024 10:41:39 +0200 Subject: [PATCH 13/13] Update upgrade --- scripts/upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index d97511b..3c0aac8 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,7 +21,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Updating $app's configuration files..." --weight=1 +ynh_script_progression --message="Upgrading source files..." --weight=1 ynh_setup_source --dest_dir="$install_dir" @@ -30,9 +30,9 @@ chown -R $app:www-data "$install_dir" chmod +x "$install_dir/cjdroute" #================================================= -# INTEGRATE SERVICE IN YUNOHOST +# UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Integrating cjdns service in YunoHost..." +ynh_script_progression --message="Updating $app's configuration files..." --weight=1 yunohost service add $app --description="Encrypted IPv6 network" --log="/var/log/$app/$app.log"