From 92a2276651ff63a8ff3047bf9554801c1e635fe7 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Tue, 30 Jul 2024 22:26:35 +0200 Subject: [PATCH 1/6] Upgrade to v2024.07.22 (#119) * Upgrade sources - `main` v2024.07.22: https://github.com/datenstrom/yellow/compare/9cc6912ebd449a4182d77c908a6b6425c3bca111...6139298476677ec63523055923b37ad5c6971d39 * Auto-update READMEs --- ALL_README.md | 1 + README.md | 4 ++-- README_es.md | 4 ++-- README_eu.md | 4 ++-- README_fr.md | 4 ++-- README_gl.md | 4 ++-- README_id.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 4 ++-- manifest.toml | 6 +++--- 9 files changed, 65 insertions(+), 15 deletions(-) create mode 100644 README_id.md diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..4ed64dd 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -5,4 +5,5 @@ - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) +- [Baca README dalam bahasa bahasa Indonesia](README_id.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 8f31bd3..27e62e3 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Yellow for YunoHost -[![Integration level](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![Working status](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/yellow.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/) ![Working status](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) [![Install Yellow with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yellow) @@ -18,7 +18,7 @@ It shall NOT be edited by hand. Yellow is for people who make small websites -**Shipped version:** 2024.05.29~ynh1 +**Shipped version:** 2024.07.22~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 4ac6b4d..0b376e3 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Yellow para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/yellow.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) [![Instalar Yellow con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yellow) @@ -18,7 +18,7 @@ No se debe editar a mano. Yellow is for people who make small websites -**Versión actual:** 2024.05.29~ynh1 +**Versión actual:** 2024.07.22~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index bc65702..05d8186 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Yellow YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/yellow.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) [![Instalatu Yellow YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yellow) @@ -18,7 +18,7 @@ EZ editatu eskuz. Yellow is for people who make small websites -**Paketatutako bertsioa:** 2024.05.29~ynh1 +**Paketatutako bertsioa:** 2024.07.22~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 92d0f64..72092fa 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Yellow pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/yellow.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) [![Installer Yellow avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yellow) @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. Yellow is for people who make small websites -**Version incluse :** 2024.05.29~ynh1 +**Version incluse :** 2024.07.22~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 7a1d280..6773014 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Yellow para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/yellow.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) [![Instalar Yellow con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yellow) @@ -18,7 +18,7 @@ NON debe editarse manualmente. Yellow is for people who make small websites -**Versión proporcionada:** 2024.05.29~ynh1 +**Versión proporcionada:** 2024.07.22~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..95ffeae --- /dev/null +++ b/README_id.md @@ -0,0 +1,49 @@ + + +# Yellow untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/yellow.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) + +[![Pasang Yellow dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yellow) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang Yellow secara cepat dan mudah pada server YunoHost.* +> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.* + +## Ringkasan + +Yellow is for people who make small websites + +**Versi terkirim:** 2024.07.22~ynh1 + +**Demo:** + +## Tangkapan Layar + +![Tangkapan Layar pada Yellow](./doc/screenshots/datenstrom-yellow-en.png) + +## Dokumentasi dan sumber daya + +- Website aplikasi resmi: +- Dokumentasi admin resmi: +- Depot kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/yellow_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug +atau +sudo yunohost app upgrade yellow -u https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 4d4c9cb..b073222 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Yellow -[![集成程度](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![工作状态](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/yellow.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) [![使用 YunoHost 安装 Yellow](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yellow) @@ -18,7 +18,7 @@ Yellow is for people who make small websites -**分发版本：** 2024.05.29~ynh1 +**分发版本：** 2024.07.22~ynh1 **演示：** diff --git a/manifest.toml b/manifest.toml index 085f956..931f02c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2024.05.29~ynh1" +version = "2024.07.22~ynh1" maintainers = [] @@ -43,8 +43,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/9cc6912ebd449a4182d77c908a6b6425c3bca111.tar.gz" - sha256 = "1dcee8680ffd024d09e84146ece93e3e00e0877c65192d648363aa3bc004036a" + url = "https://github.com/datenstrom/yellow/archive/6139298476677ec63523055923b37ad5c6971d39.tar.gz" + sha256 = "57adfca38d47b6bfc2642023c40fe7985079c56057ac35759252d081ffdfeff1" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From e390fa07cfc5eed62503f08197c28a7ee6cd24cd Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Mon, 5 Aug 2024 08:20:30 +0200 Subject: [PATCH 2/6] Upgrade to v2024.07.29 (#121) * Upgrade sources - `main` v2024.07.29: https://github.com/datenstrom/yellow/compare/6139298476677ec63523055923b37ad5c6971d39...b09ed3e6277f05d99580b23ad9a7456d49f28796 * Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_zh_Hans.md | 2 +- manifest.toml | 6 +++--- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 27e62e3..41f2d63 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ It shall NOT be edited by hand. Yellow is for people who make small websites -**Shipped version:** 2024.07.22~ynh1 +**Shipped version:** 2024.07.29~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 0b376e3..de082f3 100644 --- a/README_es.md +++ b/README_es.md @@ -18,7 +18,7 @@ No se debe editar a mano. Yellow is for people who make small websites -**Versión actual:** 2024.07.22~ynh1 +**Versión actual:** 2024.07.29~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 05d8186..06f33d3 100644 --- a/README_eu.md +++ b/README_eu.md @@ -18,7 +18,7 @@ EZ editatu eskuz. Yellow is for people who make small websites -**Paketatutako bertsioa:** 2024.07.22~ynh1 +**Paketatutako bertsioa:** 2024.07.29~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 72092fa..97dd831 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. Yellow is for people who make small websites -**Version incluse :** 2024.07.22~ynh1 +**Version incluse :** 2024.07.29~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 6773014..e412b6c 100644 --- a/README_gl.md +++ b/README_gl.md @@ -18,7 +18,7 @@ NON debe editarse manualmente. Yellow is for people who make small websites -**Versión proporcionada:** 2024.07.22~ynh1 +**Versión proporcionada:** 2024.07.29~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index 95ffeae..10179d7 100644 --- a/README_id.md +++ b/README_id.md @@ -18,7 +18,7 @@ Ini TIDAK boleh diedit dengan tangan. Yellow is for people who make small websites -**Versi terkirim:** 2024.07.22~ynh1 +**Versi terkirim:** 2024.07.29~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index b073222..31c308b 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -18,7 +18,7 @@ Yellow is for people who make small websites -**分发版本：** 2024.07.22~ynh1 +**分发版本：** 2024.07.29~ynh1 **演示：** diff --git a/manifest.toml b/manifest.toml index 931f02c..5375430 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2024.07.22~ynh1" +version = "2024.07.29~ynh1" maintainers = [] @@ -43,8 +43,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/6139298476677ec63523055923b37ad5c6971d39.tar.gz" - sha256 = "57adfca38d47b6bfc2642023c40fe7985079c56057ac35759252d081ffdfeff1" + url = "https://github.com/datenstrom/yellow/archive/b09ed3e6277f05d99580b23ad9a7456d49f28796.tar.gz" + sha256 = "67c466a61812e7326f9657fe608766799268cc025cdd1896f69d25d4d02cf7f4" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From 44ef77ca1056a453c5ed9d819034e050dcd4ef3f Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Mon, 26 Aug 2024 14:52:56 +0200 Subject: [PATCH 3/6] Upgrade to v2024.08.19 (#122) * Upgrade sources - `main` v2024.08.19: https://github.com/datenstrom/yellow/compare/b09ed3e6277f05d99580b23ad9a7456d49f28796...aa80148bf382db66f8b7812af64532876268f421 * Auto-update READMEs --- ALL_README.md | 1 + README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_ru.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 2 +- manifest.toml | 6 +++--- 10 files changed, 60 insertions(+), 10 deletions(-) create mode 100644 README_ru.md diff --git a/ALL_README.md b/ALL_README.md index 4ed64dd..e3c80d2 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -6,4 +6,5 @@ - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) - [Baca README dalam bahasa bahasa Indonesia](README_id.md) +- [Прочитать README на русский](README_ru.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 41f2d63..0dd7b69 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ It shall NOT be edited by hand. Yellow is for people who make small websites -**Shipped version:** 2024.07.29~ynh1 +**Shipped version:** 2024.08.19~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index de082f3..9b7e8af 100644 --- a/README_es.md +++ b/README_es.md @@ -18,7 +18,7 @@ No se debe editar a mano. Yellow is for people who make small websites -**Versión actual:** 2024.07.29~ynh1 +**Versión actual:** 2024.08.19~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 06f33d3..3a8d8e3 100644 --- a/README_eu.md +++ b/README_eu.md @@ -18,7 +18,7 @@ EZ editatu eskuz. Yellow is for people who make small websites -**Paketatutako bertsioa:** 2024.07.29~ynh1 +**Paketatutako bertsioa:** 2024.08.19~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 97dd831..4b26e68 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. Yellow is for people who make small websites -**Version incluse :** 2024.07.29~ynh1 +**Version incluse :** 2024.08.19~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index e412b6c..1e322b0 100644 --- a/README_gl.md +++ b/README_gl.md @@ -18,7 +18,7 @@ NON debe editarse manualmente. Yellow is for people who make small websites -**Versión proporcionada:** 2024.07.29~ynh1 +**Versión proporcionada:** 2024.08.19~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index 10179d7..a7d75e8 100644 --- a/README_id.md +++ b/README_id.md @@ -18,7 +18,7 @@ Ini TIDAK boleh diedit dengan tangan. Yellow is for people who make small websites -**Versi terkirim:** 2024.07.29~ynh1 +**Versi terkirim:** 2024.08.19~ynh1 **Demo:** diff --git a/README_ru.md b/README_ru.md new file mode 100644 index 0000000..e8e08ac --- /dev/null +++ b/README_ru.md @@ -0,0 +1,49 @@ + + +# Yellow для YunoHost + +[![Уровень интеграции](https://dash.yunohost.org/integration/yellow.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) + +[![Установите Yellow с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yellow) + +*[Прочтите этот README на других языках.](./ALL_README.md)* + +> *Этот пакет позволяет Вам установить Yellow быстро и просто на YunoHost-сервер.* +> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.* + +## Обзор + +Yellow is for people who make small websites + +**Поставляемая версия:** 2024.08.19~ynh1 + +**Демо-версия:** + +## Снимки экрана + +![Снимок экрана Yellow](./doc/screenshots/datenstrom-yellow-en.png) + +## Документация и ресурсы + +- Официальный веб-сайт приложения: +- Официальная документация администратора: +- Репозиторий кода главной ветки приложения: +- Магазин YunoHost: +- Сообщите об ошибке: + +## Информация для разработчиков + +Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/yellow_ynh/tree/testing). + +Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug +или +sudo yunohost app upgrade yellow -u https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug +``` + +**Больше информации о пакетировании приложений:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 31c308b..4897614 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -18,7 +18,7 @@ Yellow is for people who make small websites -**分发版本：** 2024.07.29~ynh1 +**分发版本：** 2024.08.19~ynh1 **演示：** diff --git a/manifest.toml b/manifest.toml index 5375430..9935034 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2024.07.29~ynh1" +version = "2024.08.19~ynh1" maintainers = [] @@ -43,8 +43,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/b09ed3e6277f05d99580b23ad9a7456d49f28796.tar.gz" - sha256 = "67c466a61812e7326f9657fe608766799268cc025cdd1896f69d25d4d02cf7f4" + url = "https://github.com/datenstrom/yellow/archive/aa80148bf382db66f8b7812af64532876268f421.tar.gz" + sha256 = "64beccafa6685598963ffdfcdc3967eadaa08e3ad0449d4eac9acff410cc0401" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From 24d334c7e577b485d4c76183b9fcc869938fbca1 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Sat, 31 Aug 2024 08:57:40 +0200 Subject: [PATCH 4/6] [autopatch] Automatic patch attempt for helpers 2.1 (#123) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [autopatch] Automatic patch attempt for helpers 2.1 * cleaning --------- Co-authored-by: Yunohost-Bot <> Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> --- conf/extra_php-fpm.conf | 4 ---- conf/nginx.conf | 2 +- doc/DESCRIPTION.md | 2 +- manifest.toml | 11 ++++++----- scripts/_common.sh | 14 +------------- scripts/backup | 25 ++++++------------------- scripts/change_url | 12 +++--------- scripts/install | 22 +++++----------------- scripts/remove | 16 ++++------------ scripts/restore | 31 +++++++++---------------------- scripts/upgrade | 34 ++++++---------------------------- 11 files changed, 42 insertions(+), 131 deletions(-) delete mode 100644 conf/extra_php-fpm.conf diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf deleted file mode 100644 index 700c37c..0000000 --- a/conf/extra_php-fpm.conf +++ /dev/null @@ -1,4 +0,0 @@ -; Additional php.ini defines, specific to this pool of workers. - -php_admin_value[upload_max_filesize] = 50M -php_admin_value[post_max_size] = 50M diff --git a/conf/nginx.conf b/conf/nginx.conf index 96bf29e..be7c6e1 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -25,7 +25,7 @@ location __PATH__/ { try_files $uri $uri/ yellow.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; + fastcgi_pass unix:/var/run/php/php__PHP_VERSION__-fpm-__APP__.sock; fastcgi_index yellow.php; include fastcgi_params; fastcgi_param REMOTE_USER $remote_user; diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 8eb52e8..8390cca 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1 @@ -Yellow is for people who make small websites \ No newline at end of file +Yellow is for people who make small websites. \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 9935034..235ef2c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -2,8 +2,8 @@ packaging_format = 2 id = "yellow" name = "Yellow" -description.en = "Content management system (CMS) for simple website" -description.fr = "Système de gestion de contenu (CMS) pour un site simple" +description.en = "Content management system for simple website" +description.fr = "Système de gestion de contenu pour un site simple" version = "2024.08.19~ynh1" @@ -17,7 +17,8 @@ admindoc = "https://datenstrom.se/yellow/help/" code = "https://github.com/datenstrom/yellow/" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.29" +helpers_version = "2.1" architectures = "all" multi_instance = true @@ -51,10 +52,10 @@ ram.runtime = "50M" [resources.system_user] [resources.install_dir] + group = "www-data:r-x" [resources.permissions] main.url = "/" [resources.apt] - packages = "php8.2-mbstring, php8.2-xmlrpc, php8.2-sqlite3, php8.2-soap, php8.2-gd, php8.2-xml, php8.2-cli, php8.2-curl, php8.2-zip" - + packages = "php8.3-mbstring, php8.3-xmlrpc, php8.3-sqlite3, php8.3-soap, php8.3-gd, php8.3-xml, php8.3-cli, php8.3-curl, php8.3-zip" diff --git a/scripts/_common.sh b/scripts/_common.sh index 944a65e..3d7f008 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,17 +1,5 @@ #!/bin/bash #================================================= -# COMMON VARIABLES -#================================================= - -#================================================= -# PERSONAL HELPERS -#================================================= - -#================================================= -# EXPERIMENTAL HELPERS -#================================================= - -#================================================= -# FUTURE OFFICIAL HELPERS +# COMMON VARIABLES AND CUSTOM HELPERS #================================================= diff --git a/scripts/backup b/scripts/backup index 851d286..2f83233 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,39 +1,26 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# DECLARE DATA AND CONF FILES TO BACKUP -#================================================= -ynh_print_info --message="Declaring files to be backed up..." +ynh_print_info "Declaring files to be backed up..." #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="$install_dir" +ynh_backup "$install_dir" #================================================= -# BACKUP THE NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= -ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - -ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +ynh_backup "/etc/php/$php_version/fpm/pool.d/$app.conf" #================================================= # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." +ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index 124bf3a..39d37fc 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,23 +1,17 @@ #!/bin/bash -#================================================= -# GENERIC STARTING -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2 +ynh_script_progression "Updating NGINX web server configuration..." -ynh_change_url_nginx_config +ynh_config_change_url_nginx #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --last +ynh_script_progression "Change of URL completed for $app" diff --git a/scripts/install b/scripts/install index 5be4c19..16a3a4c 100644 --- a/scripts/install +++ b/scripts/install @@ -1,38 +1,26 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --weight=7 +ynh_script_progression "Setting up source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" - #================================================= # SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 +ynh_script_progression "Adding system configurations related to $app..." -# Create a dedicated NGINX config -ynh_add_nginx_config +ynh_config_add_nginx -# Create a dedicated PHP-FPM config -ynh_add_fpm_config +ynh_config_add_phpfpm #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --last +ynh_script_progression "Installation of $app completed" diff --git a/scripts/remove b/scripts/remove index 5b17c2d..ee9c6ec 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,27 +1,19 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers #================================================= # REMOVE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 +ynh_script_progression "Removing system configurations related to $app..." -# Remove the dedicated NGINX config -ynh_remove_nginx_config +ynh_config_remove_nginx -# Remove the dedicated PHP-FPM config -ynh_remove_fpm_config +ynh_config_remove_phpfpm #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --last +ynh_script_progression "Removal of $app completed" diff --git a/scripts/restore b/scripts/restore index a1e8f97..2182661 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,47 +1,34 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring the app main directory..." --weight=2 +ynh_script_progression "Restoring the app main directory..." -ynh_restore_file --origin_path="$install_dir" - -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +ynh_restore "$install_dir" #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 +ynh_script_progression "Restoring system configurations related to $app..." -ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +ynh_restore "/etc/php/$php_version/fpm/pool.d/$app.conf" -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# GENERIC FINALIZATION #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=2 +ynh_script_progression "Reloading NGINX web server and PHP-FPM..." -ynh_systemd_action --service_name=php$phpversion-fpm --action=reload -ynh_systemd_action --service_name=nginx --action=reload +ynh_systemctl --service=php$php_version-fpm --action=reload +ynh_systemctl --service=nginx --action=reload #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --last +ynh_script_progression "Restoration completed for $app" diff --git a/scripts/upgrade b/scripts/upgrade index 7217840..21cf57a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,48 +1,26 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression "Upgrading source files..." -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=2 - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="content media system/extensions" -fi - -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +ynh_setup_source --dest_dir="$install_dir" --keep="content media system/extensions" #================================================= # REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 +ynh_script_progression "Upgrading system configurations related to $app..." -# Create a dedicated NGINX config -ynh_add_nginx_config +ynh_config_add_nginx -# Create a dedicated php-fpm config -ynh_add_fpm_config +ynh_config_add_phpfpm #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --last +ynh_script_progression "Upgrade of $app completed" From 478cbfff81bb9c5b02d9f52cc938c67f0c0594e3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 31 Aug 2024 06:57:43 +0000 Subject: [PATCH 5/6] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0dd7b69..b66e1af 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ It shall NOT be edited by hand. ## Overview -Yellow is for people who make small websites +Yellow is for people who make small websites. **Shipped version:** 2024.08.19~ynh1 diff --git a/README_es.md b/README_es.md index 9b7e8af..a1e53df 100644 --- a/README_es.md +++ b/README_es.md @@ -16,7 +16,7 @@ No se debe editar a mano. ## Descripción general -Yellow is for people who make small websites +Yellow is for people who make small websites. **Versión actual:** 2024.08.19~ynh1 diff --git a/README_eu.md b/README_eu.md index 3a8d8e3..00bfae2 100644 --- a/README_eu.md +++ b/README_eu.md @@ -16,7 +16,7 @@ EZ editatu eskuz. ## Aurreikuspena -Yellow is for people who make small websites +Yellow is for people who make small websites. **Paketatutako bertsioa:** 2024.08.19~ynh1 diff --git a/README_fr.md b/README_fr.md index 4b26e68..f5c4f96 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,7 @@ Il NE doit PAS être modifié à la main. ## Vue d’ensemble -Yellow is for people who make small websites +Yellow is for people who make small websites. **Version incluse :** 2024.08.19~ynh1 diff --git a/README_gl.md b/README_gl.md index 1e322b0..589e177 100644 --- a/README_gl.md +++ b/README_gl.md @@ -16,7 +16,7 @@ NON debe editarse manualmente. ## Vista xeral -Yellow is for people who make small websites +Yellow is for people who make small websites. **Versión proporcionada:** 2024.08.19~ynh1 diff --git a/README_id.md b/README_id.md index a7d75e8..9ff2a2f 100644 --- a/README_id.md +++ b/README_id.md @@ -16,7 +16,7 @@ Ini TIDAK boleh diedit dengan tangan. ## Ringkasan -Yellow is for people who make small websites +Yellow is for people who make small websites. **Versi terkirim:** 2024.08.19~ynh1 diff --git a/README_ru.md b/README_ru.md index e8e08ac..24f4263 100644 --- a/README_ru.md +++ b/README_ru.md @@ -16,7 +16,7 @@ ## Обзор -Yellow is for people who make small websites +Yellow is for people who make small websites. **Поставляемая версия:** 2024.08.19~ynh1 diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 4897614..7e117fa 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -16,7 +16,7 @@ ## 概况 -Yellow is for people who make small websites +Yellow is for people who make small websites. **分发版本：** 2024.08.19~ynh1 From 9483f1a05d1ee64e7b68cac36c40abfcdaa25dc9 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Mon, 2 Sep 2024 08:56:37 +0200 Subject: [PATCH 6/6] Upgrade to v2024.08.28 (#124) * Upgrade sources - `main` v2024.08.28: https://github.com/datenstrom/yellow/compare/aa80148bf382db66f8b7812af64532876268f421...e6513df19c02ed7d8abfe1d544ee8ae2bd1e2644 * Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- manifest.toml | 6 +++--- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index b66e1af..dd8a634 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ It shall NOT be edited by hand. Yellow is for people who make small websites. -**Shipped version:** 2024.08.19~ynh1 +**Shipped version:** 2024.08.28~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index a1e53df..8c09fa2 100644 --- a/README_es.md +++ b/README_es.md @@ -18,7 +18,7 @@ No se debe editar a mano. Yellow is for people who make small websites. -**Versión actual:** 2024.08.19~ynh1 +**Versión actual:** 2024.08.28~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 00bfae2..bf19e52 100644 --- a/README_eu.md +++ b/README_eu.md @@ -18,7 +18,7 @@ EZ editatu eskuz. Yellow is for people who make small websites. -**Paketatutako bertsioa:** 2024.08.19~ynh1 +**Paketatutako bertsioa:** 2024.08.28~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index f5c4f96..da38d3b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. Yellow is for people who make small websites. -**Version incluse :** 2024.08.19~ynh1 +**Version incluse :** 2024.08.28~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 589e177..c404f51 100644 --- a/README_gl.md +++ b/README_gl.md @@ -18,7 +18,7 @@ NON debe editarse manualmente. Yellow is for people who make small websites. -**Versión proporcionada:** 2024.08.19~ynh1 +**Versión proporcionada:** 2024.08.28~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index 9ff2a2f..be4359d 100644 --- a/README_id.md +++ b/README_id.md @@ -18,7 +18,7 @@ Ini TIDAK boleh diedit dengan tangan. Yellow is for people who make small websites. -**Versi terkirim:** 2024.08.19~ynh1 +**Versi terkirim:** 2024.08.28~ynh1 **Demo:** diff --git a/README_ru.md b/README_ru.md index 24f4263..8513b10 100644 --- a/README_ru.md +++ b/README_ru.md @@ -18,7 +18,7 @@ Yellow is for people who make small websites. -**Поставляемая версия:** 2024.08.19~ynh1 +**Поставляемая версия:** 2024.08.28~ynh1 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 7e117fa..56968e7 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -18,7 +18,7 @@ Yellow is for people who make small websites. -**分发版本：** 2024.08.19~ynh1 +**分发版本：** 2024.08.28~ynh1 **演示：** diff --git a/manifest.toml b/manifest.toml index 235ef2c..925f5b8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system for simple website" description.fr = "Système de gestion de contenu pour un site simple" -version = "2024.08.19~ynh1" +version = "2024.08.28~ynh1" maintainers = [] @@ -44,8 +44,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/aa80148bf382db66f8b7812af64532876268f421.tar.gz" - sha256 = "64beccafa6685598963ffdfcdc3967eadaa08e3ad0449d4eac9acff410cc0401" + url = "https://github.com/datenstrom/yellow/archive/e6513df19c02ed7d8abfe1d544ee8ae2bd1e2644.tar.gz" + sha256 = "cd8d2c58814bb06c5d6f5650edd3ec6bbcf52bff742d50310d11de4e31f3546d" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit"