From b4b2d876fa27de948ac22e4b6ac1247b7ab09905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 28 May 2024 23:50:46 +0200 Subject: [PATCH 1/7] Depend on 11.2 --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 218bf3c..ffeb110 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ website = "https://code.ffdn.org/FFDN/coin" code = "https://code.ffdn.org/ffdn/coin" [integration] -yunohost = ">= 11.0.0" +yunohost = ">= 11.2.0" architectures = "all" multi_instance = false ldap = false From 2060506b62b7e14d947b04adf40972e0c3d8e4fa Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 28 May 2024 21:50:54 +0000 Subject: [PATCH 2/7] Auto-update READMEs --- ALL_README.md | 2 ++ README_es.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+) create mode 100644 README_es.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md index 77b7509..152f2e7 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,8 @@ # All available README files by language - [Read the README in English](README.md) +- [Lea 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..6680ebb --- /dev/null +++ b/README_es.md @@ -0,0 +1,58 @@ + + +# Coin para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/coin.svg)](https://dash.yunohost.org/appci/app/coin) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/coin.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/coin.maintain.svg) + +[![Instalar Coin con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=coin) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarCoin 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 + +COIN is an Information System designed for associative ISPs in the FFDN. + +### Features + +- Provide a nice, clean UI for members +- Manage memberships +- Handle service requests for VPN, VPS, Housing, external accounts, etc, + - including IP pools management + - custom hooks can be added to interface with the actual infrastructure and provision services from the admin + - members can get status info regarding their services + - handle invoices, send reminders, import payment from bank, derive a member balance +- Optional features: mailing list, hardware provisionning + + +**Versión actual:** 20231216~ynh1 + +## Capturas + +![Captura de Coin](./doc/screenshots/screenshot.png) + +## Documentaciones y recursos + +- Sitio web oficial: +- 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/coin_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/coin_ynh/tree/testing --debug +o +sudo yunohost app upgrade coin -u https://github.com/YunoHost-Apps/coin_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..0de766c --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,58 @@ + + +# YunoHost 上的 Coin + +[![集成程度](https://dash.yunohost.org/integration/coin.svg)](https://dash.yunohost.org/appci/app/coin) ![工作状态](https://ci-apps.yunohost.org/ci/badges/coin.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/coin.maintain.svg) + +[![使用 YunoHost 安装 Coin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=coin) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Coin。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +COIN is an Information System designed for associative ISPs in the FFDN. + +### Features + +- Provide a nice, clean UI for members +- Manage memberships +- Handle service requests for VPN, VPS, Housing, external accounts, etc, + - including IP pools management + - custom hooks can be added to interface with the actual infrastructure and provision services from the admin + - members can get status info regarding their services + - handle invoices, send reminders, import payment from bank, derive a member balance +- Optional features: mailing list, hardware provisionning + + +**分发版本：** 20231216~ynh1 + +## 截图 + +![Coin 的截图](./doc/screenshots/screenshot.png) + +## 文档与资源 + +- 官方应用网站： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/coin_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/coin_ynh/tree/testing --debug +或 +sudo yunohost app upgrade coin -u https://github.com/YunoHost-Apps/coin_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From 8769826f7c97e0c97c09081cee01bb30e075c881 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 11 Mar 2024 15:40:12 +0100 Subject: [PATCH 3/7] [autopatch] TEST BEFORE MERGE ynh_setup_source --full_replace=1 --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 1245234..04058e9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,7 +23,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" + ynh_setup_source --dest_dir="$install_dir" --full_replace=1 fi From a831090bf46af82c49314b4314e4ac1e0222a924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 1 May 2024 10:37:23 +0200 Subject: [PATCH 4/7] Fix spaces at end of line --- scripts/install | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index 005049a..e5a75ee 100644 --- a/scripts/install +++ b/scripts/install @@ -9,7 +9,7 @@ ynh_app_setting_set --app=$app --key=secret --value=$secret #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." +ynh_script_progression --message="Setting up source files..." ynh_setup_source --dest_dir="$install_dir" @@ -22,7 +22,7 @@ chown -R $app:www-data "$install_dir" #================================================= # PYTHON DEPENDENCIES #================================================= -ynh_script_progression --message="Installing more dependencies..." +ynh_script_progression --message="Installing more dependencies..." pushd "$install_dir" python3 -m venv venv @@ -35,7 +35,7 @@ popd #================================================= # CONFIGURATION DJANGO #================================================= -ynh_script_progression --message="Configuring application..." +ynh_script_progression --message="Configuring application..." export prefix="${path#"/"}/" prefix=${prefix%"/"} @@ -65,7 +65,7 @@ chown -R $app:www-data "/var/log/$app" #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." +ynh_script_progression --message="Adding a configuration file..." ynh_add_config --template="gunicorn_config.py" --destination="$install_dir/gunicorn_config.py" @@ -88,7 +88,7 @@ yunohost service add $app --description "$app daemon" --log="/var/log/$app/$app. #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting systemd service..." +ynh_script_progression --message="Starting systemd service..." # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" From f83d51222bb439ee79453ace55d8ba7e56651f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 1 May 2024 10:39:21 +0200 Subject: [PATCH 5/7] Fix upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 04058e9..d97a29d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,7 +23,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --full_replace=1 + ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=coin/settings_local.py fi From 113d30f49918a7ef8751b4c58d7068cd106b85f5 Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Mon, 29 Apr 2024 23:15:36 +0200 Subject: [PATCH 6/7] Revert "Use metapackage for PostgreSQL dev libraries. (#34)" This reverts commit e3a41bc5c28ffee75e6d8ef7b03ca181c238d777. --- manifest.toml | 2 +- sources/patches/main-001.patch | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 sources/patches/main-001.patch diff --git a/manifest.toml b/manifest.toml index ffeb110..41f4e86 100644 --- a/manifest.toml +++ b/manifest.toml @@ -68,7 +68,7 @@ ram.runtime = "50M" main.allowed = "visitors" [resources.apt] - packages = "gunicorn, python3, python3-venv, libpq-dev, libsasl2-dev, libjpeg-dev, libxml2-dev, libxslt1-dev, libpango1.0-0, postgresql, postgresql-contrib, postgresql-server-dev-all python3-dev" + packages = "gunicorn, python3, python3-venv, libpq-dev, libsasl2-dev, libjpeg-dev, libxml2-dev, libxslt1-dev, libpango1.0-0, postgresql, postgresql-contrib, postgresql-server-dev-13" [resources.database] type = "postgresql" diff --git a/sources/patches/main-001.patch b/sources/patches/main-001.patch deleted file mode 100644 index c943b3a..0000000 --- a/sources/patches/main-001.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/requirements.txt b/requirements.txt -index 27c1a5c..a21fd3d 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,5 +1,5 @@ - Django>=2.2,<2.3 --psycopg2>=2.8,<2.9 -+psycopg2>=2.9,<3.0 - # To match django-ldapdb version: - #python-ldap>=3.0,<3.1 - #wsgiref From 2ed83d3309729d90f69cdeb61237d1315830bb1c Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 23 Jun 2024 21:31:00 +0200 Subject: [PATCH 7/7] [autopatch] Do not delete logs on app removal --- scripts/remove | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index 23b5bb5..15cd040 100644 --- a/scripts/remove +++ b/scripts/remove @@ -18,7 +18,6 @@ ynh_remove_systemd_config ynh_remove_nginx_config # Remove the log files -ynh_secure_remove --file="/var/log/$app" #================================================= # END OF SCRIPT