From b67757478a86972182ff99c350c01ebd9b90f6c6 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 11 Mar 2024 15:40:12 +0100 Subject: [PATCH 1/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 363f52c3ae5ee3ded8a92135f776aca97dccc097 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 25 Apr 2024 15:26:10 +0000 Subject: [PATCH 2/7] Auto-update READMEs --- ALL_README.md | 1 + README_zh_Hans.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md index 77b7509..a01b345 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -4,3 +4,4 @@ - [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_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..3c4d059 --- /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 b31e4890bad98cf08a6caf3b031c003c58030978 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 3/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 ad2a8c044066376ef3841c687687dc7307defbac 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 4/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 30500411c7b78311623df40eaa437023123cfa42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Tue, 30 Apr 2024 21:18:40 +0200 Subject: [PATCH 5/7] Add support for sending email --- conf/local.py.j2 | 9 +++++++-- manifest.toml | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/conf/local.py.j2 b/conf/local.py.j2 index 477fd56..4260a07 100644 --- a/conf/local.py.j2 +++ b/conf/local.py.j2 @@ -29,13 +29,18 @@ DATABASES = { 'USER': '{{ db_user }}', 'PASSWORD': '{{ db_pwd }}', 'HOST': '127.0.0.1', - 'PORT': '5432', + 'PORT': '5432', }, } FEEDS = (('ffdn', 'http://www.ffdn.org/fr/rss.xml', 3),) - +# Email settings +EMAIL_USE_TLS = True +EMAIL_PORT = 587 +EMAIL_HOST = '{{ domain }}' +EMAIL_HOST_USER = '{{ app }}@{{ domain }}' +EMAIL_HOST_PASSWORD = '{{ mail_pwd }}' # # Tous acces # # parametrer SSO en protect_uris diff --git a/manifest.toml b/manifest.toml index 218bf3c..94906bd 100644 --- a/manifest.toml +++ b/manifest.toml @@ -60,6 +60,7 @@ ram.runtime = "50M" autoupdate.strategy = "latest_gitlab_commit" [resources.system_user] + allow_email = true [resources.install_dir] From 954549209ca428eedae0dbbb3fd70a44ac3e5a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Tue, 30 Apr 2024 21:18:58 +0200 Subject: [PATCH 6/7] Fix identation --- manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index 94906bd..23435fc 100644 --- a/manifest.toml +++ b/manifest.toml @@ -54,10 +54,10 @@ ram.runtime = "50M" example = "https://www.exemple.tld" [resources] - [resources.sources.main] - url = "https://code.ffdn.org/ffdn/coin/-/archive/bcaad5f.tar.gz" - sha256 = "241d527c7bab5410bcc225d5beeff8286aa8ae649b9711c421624ae96136cdd7" - autoupdate.strategy = "latest_gitlab_commit" + [resources.sources.main] + url = "https://code.ffdn.org/ffdn/coin/-/archive/bcaad5f.tar.gz" + sha256 = "241d527c7bab5410bcc225d5beeff8286aa8ae649b9711c421624ae96136cdd7" + autoupdate.strategy = "latest_gitlab_commit" [resources.system_user] allow_email = true From f9d2110da3dbb5f6db71ea957faea9738d588e37 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 28 Jun 2024 21:39:13 +0000 Subject: [PATCH 7/7] 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 | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2f1b8e0..5370751 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Coin for YunoHost -[![Integration level](https://dash.yunohost.org/integration/coin.svg)](https://dash.yunohost.org/appci/app/coin) ![Working status](https://ci-apps.yunohost.org/ci/badges/coin.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/coin.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/coin.svg)](https://ci-apps.yunohost.org/ci/apps/coin/) ![Working status](https://ci-apps.yunohost.org/ci/badges/coin.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/coin.maintain.svg) [![Install Coin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=coin) diff --git a/README_es.md b/README_es.md index 6680ebb..4312fd2 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # 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) +[![Nivel de integración](https://dash.yunohost.org/integration/coin.svg)](https://ci-apps.yunohost.org/ci/apps/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) diff --git a/README_eu.md b/README_eu.md index 16c7e75..194a3f4 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Coin YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/coin.svg)](https://dash.yunohost.org/appci/app/coin) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/coin.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/coin.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/coin.svg)](https://ci-apps.yunohost.org/ci/apps/coin/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/coin.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/coin.maintain.svg) [![Instalatu Coin YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=coin) diff --git a/README_fr.md b/README_fr.md index 3d8b7a3..4f010d7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Coin pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/coin.svg)](https://dash.yunohost.org/appci/app/coin) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/coin.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/coin.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/coin.svg)](https://ci-apps.yunohost.org/ci/apps/coin/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/coin.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/coin.maintain.svg) [![Installer Coin avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=coin) diff --git a/README_gl.md b/README_gl.md index f27d2b3..f1d486a 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Coin para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/coin.svg)](https://dash.yunohost.org/appci/app/coin) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/coin.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/coin.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/coin.svg)](https://ci-apps.yunohost.org/ci/apps/coin/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/coin.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/coin.maintain.svg) [![Instalar Coin con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=coin) diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 3c4d059..20e90d8 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -3,9 +3,9 @@ 请勿手动编辑。 --> -# YunoHost 的 Coin +# 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) +[![集成程度](https://dash.yunohost.org/integration/coin.svg)](https://ci-apps.yunohost.org/ci/apps/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)