From 2a4b13d3d6dd72902e33f61ee19e0e41e901ca64 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 22 Feb 2022 13:34:10 +0000 Subject: [PATCH 01/17] Upgrade to v2.21.1 --- conf/app.src | 6 +++--- manifest.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/app.src b/conf/app.src index 0aff2cf..b7fb7f0 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.20.1.zip -SOURCE_SUM=fdd919ac1d1499987bb6707a585f9e5eae34d3cdf9f62db9852ea9cd6f8e17a9 +SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.21.1.tar.gz +SOURCE_SUM=a48c7332bc31d32a6a8d8339bc74199497b9a8b9824c98e06c6aa1cffff0c7dc SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip +SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index cf266d8..e893e49 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Blog publishing application", "fr": "Moteur de blog" }, - "version": "2.20.1~ynh2", + "version": "2.21.1~ynh1", "license": "GPL-2.0-or-later", "url": "https://dotclear.org/", "maintainer": { @@ -23,7 +23,7 @@ "mysql" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain", From 6cf78f759e8f8bd681f5b31b32b9348b96d35df5 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 22 Feb 2022 15:23:08 +0100 Subject: [PATCH 02/17] fix patch --- sources/patches/app-00-password_length.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/patches/app-00-password_length.patch b/sources/patches/app-00-password_length.patch index b020960..09b9a91 100644 --- a/sources/patches/app-00-password_length.patch +++ b/sources/patches/app-00-password_length.patch @@ -1,8 +1,8 @@ diff --git a/inc/core/class.dc.core.php b/inc/core/class.dc.core.php -index 3d0c45d..98a70a6 100644 +index e9c0ac2..0c6f2e5 100644 --- a/inc/core/class.dc.core.php +++ b/inc/core/class.dc.core.php -@@ -839,8 +839,8 @@ class dcCore +@@ -941,8 +941,8 @@ class dcCore } if ($cur->isField('user_pwd')) { From 1b685055ec8e5e530765307505995773f64da153 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 22 Feb 2022 16:01:53 +0100 Subject: [PATCH 03/17] Fix install --- conf/app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/app.src b/conf/app.src index b7fb7f0..69c50ff 100644 --- a/conf/app.src +++ b/conf/app.src @@ -2,6 +2,6 @@ SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.21.1.tar.gz SOURCE_SUM=a48c7332bc31d32a6a8d8339bc74199497b9a8b9824c98e06c6aa1cffff0c7dc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true +SOURCE_IN_SUBDIR=2 SOURCE_FILENAME= SOURCE_EXTRACT=true From 428a350b7f53e1326cddf97fbeecb65f622202dc Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 22 Feb 2022 16:14:39 +0100 Subject: [PATCH 04/17] Add auto readme --- doc/DISCLAIMER.md | 9 +++++++++ doc/screenshots/ss2_dotclear.png | Bin 0 -> 26950 bytes manifest.json | 7 +++++++ 3 files changed, 16 insertions(+) create mode 100644 doc/DISCLAIMER.md create mode 100644 doc/screenshots/ss2_dotclear.png diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..2567513 --- /dev/null +++ b/doc/DISCLAIMER.md @@ -0,0 +1,9 @@ +## Configuration + +How to configure this app: by an admin panel. + +#### Multi-users support + +Are LDAP supported? **Yes** +Are HTTP auth supported? **No** (PR are welcome!) +Can the app be used by multiple users? **Yes** diff --git a/doc/screenshots/ss2_dotclear.png b/doc/screenshots/ss2_dotclear.png new file mode 100644 index 0000000000000000000000000000000000000000..aa0b4e84f5756c60ff073756f1112464cf20736c GIT binary patch literal 26950 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 literal 0 HcmV?d00001 diff --git a/manifest.json b/manifest.json index cf266d8..71a83ea 100644 --- a/manifest.json +++ b/manifest.json @@ -9,6 +9,13 @@ "version": "2.20.1~ynh2", "license": "GPL-2.0-or-later", "url": "https://dotclear.org/", + "upstream": { + "license": "GPL-2.0-or-later", + "website": "https://dotclear.org", + "demo": "https://www.softaculous.com/demos/Dotclear", + "admindoc": "https://dotclear.org/documentation/2.0", + "code": "https://git.dotclear.org/dev/dotclear" + }, "maintainer": { "name": "kay0u", "email": "pierre@kayou.io" From 70bfdb6bacf6a64353bf37b2bcc9d418d92482f9 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 22 Feb 2022 15:14:50 +0000 Subject: [PATCH 05/17] Auto-update README --- README.md | 67 ++++++++++++++++++++++------------------------------ README_fr.md | 55 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 39 deletions(-) create mode 100644 README_fr.md diff --git a/README.md b/README.md index 531af39..609f206 100644 --- a/README.md +++ b/README.md @@ -1,66 +1,53 @@ + + # DotClear 2 for YunoHost -[![Integration level](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) -[![Install dotclear2 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=dotclear2) +[![Integration level](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) +[![Install DotClear 2 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) -> *This package allow you to install dotclear2 quickly and simply on a YunoHost server. -If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allows you to install DotClear 2 quickly and simply on a YunoHost server. +If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview -Dotclear is an open-source web publishing software. -**Shipped version:** 2.20.1 +Blog publishing application + +**Shipped version:** 2.20.1~ynh2 + +**Demo:** https://www.softaculous.com/demos/Dotclear ## Screenshots -![](https://installatron.com/images/remote/ss2_dotclear.png) +![](./doc/screenshots/ss2_dotclear.png) -## Demo - -* [Official demo](https://www.softaculous.com/demos/Dotclear) +## Disclaimers / important information ## Configuration How to configure this app: by an admin panel. -## Documentation - - * Official documentation: https://dotclear.org/documentation/2.0 - -## YunoHost specific features - #### Multi-users support Are LDAP supported? **Yes** Are HTTP auth supported? **No** (PR are welcome!) Can the app be used by multiple users? **Yes** -#### Supported architectures +## Documentation and resources -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/dotclear2%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/dotclear2%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/dotclear2/) +* Official app website: https://dotclear.org +* Official admin documentation: https://dotclear.org/documentation/2.0 +* Upstream app code repository: https://git.dotclear.org/dev/dotclear +* YunoHost documentation for this app: https://yunohost.org/app_dotclear2 +* Report a bug: https://github.com/YunoHost-Apps/dotclear2_ynh/issues -## Limitations +## Developer info -* Only YunoHost users can have an admin account. (PR are welcome!) - -**More information on the documentation page:** -https://yunohost.org/packaging_apps - -## Links - - * Report a bug: https://github.com/YunoHost-Apps/dotclear2_ynh/issues - * App website: https://dotclear.org - * Upstream app repository: https://git.dotclear.org/dev/dotclear - * YunoHost website: https://yunohost.org/ - ---- - -Developers info ----------------- - -**Only if you want to use a testing branch for coding, instead of merging directly into master.** -Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing). To try the testing branch, please proceed like that. ``` @@ -68,3 +55,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/te or sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug ``` + +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..9745b61 --- /dev/null +++ b/README_fr.md @@ -0,0 +1,55 @@ +# DotClear 2 pour YunoHost + +[![Niveau d'intégration](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) +[![Installer DotClear 2 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) + +*[Read this readme in english.](./README.md)* +*[Lire ce readme en français.](./README_fr.md)* + +> *Ce package vous permet d'installer DotClear 2 rapidement et simplement sur un serveur YunoHost. +Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* + +## Vue d'ensemble + +Moteur de blog + +**Version incluse :** 2.20.1~ynh2 + +**Démo :** https://www.softaculous.com/demos/Dotclear + +## Captures d'écran + +![](./doc/screenshots/ss2_dotclear.png) + +## Avertissements / informations importantes + +## Configuration + +How to configure this app: by an admin panel. + +#### Multi-users support + +Are LDAP supported? **Yes** +Are HTTP auth supported? **No** (PR are welcome!) +Can the app be used by multiple users? **Yes** + +## Documentations et ressources + +* Site officiel de l'app : https://dotclear.org +* Documentation officielle de l'admin : https://dotclear.org/documentation/2.0 +* Dépôt de code officiel de l'app : https://git.dotclear.org/dev/dotclear +* Documentation YunoHost pour cette app : https://yunohost.org/app_dotclear2 +* Signaler un bug : https://github.com/YunoHost-Apps/dotclear2_ynh/issues + +## Informations pour les développeurs + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug +ou +sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug +``` + +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file From cb42ac31f643d72ad218d4f5bdc8f4f81a2ddf94 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 22 Feb 2022 16:31:54 +0100 Subject: [PATCH 06/17] Needs bullseye --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index e893e49..08210a4 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 4.3.2" + "yunohost": ">= 11.0.0" }, "multi_instance": true, "services": [ From 8342e85e5b54a5c4405f2cb24bbe344f92349af4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 27 Feb 2022 06:08:53 +0000 Subject: [PATCH 07/17] Upgrade to v2.21.2 --- conf/app.src | 6 +++--- manifest.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/app.src b/conf/app.src index 0aff2cf..bd89f3e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.20.1.zip -SOURCE_SUM=fdd919ac1d1499987bb6707a585f9e5eae34d3cdf9f62db9852ea9cd6f8e17a9 +SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.21.2.tar.gz +SOURCE_SUM=7cc78aefca4b10d61d1910ed7aaaad19f4b0298dff642c8600cebdc559ecb874 SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip +SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 71a83ea..cfff1e1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Blog publishing application", "fr": "Moteur de blog" }, - "version": "2.20.1~ynh2", + "version": "2.21.2~ynh1", "license": "GPL-2.0-or-later", "url": "https://dotclear.org/", "upstream": { @@ -30,7 +30,7 @@ "mysql" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain", From dfd81df395d9729ca05b90032bfe51a64de1ff83 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 27 Feb 2022 06:09:00 +0000 Subject: [PATCH 08/17] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 609f206..841f1a1 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Blog publishing application -**Shipped version:** 2.20.1~ynh2 +**Shipped version:** 2.21.2~ynh1 **Demo:** https://www.softaculous.com/demos/Dotclear diff --git a/README_fr.md b/README_fr.md index 9745b61..c8d8622 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Moteur de blog -**Version incluse :** 2.20.1~ynh2 +**Version incluse :** 2.21.2~ynh1 **Démo :** https://www.softaculous.com/demos/Dotclear From b12ed032e2db977452172b448f257f749ed56715 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 28 Feb 2022 15:44:31 +0000 Subject: [PATCH 09/17] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 609f206..fb12bb5 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Blog publishing application -**Shipped version:** 2.20.1~ynh2 +**Shipped version:** 2.21.1~ynh1 **Demo:** https://www.softaculous.com/demos/Dotclear diff --git a/README_fr.md b/README_fr.md index 9745b61..3c9fa12 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Moteur de blog -**Version incluse :** 2.20.1~ynh2 +**Version incluse :** 2.21.1~ynh1 **Démo :** https://www.softaculous.com/demos/Dotclear From 96a1594a6e4c6b2298bb10e714571bd2c1ea2f57 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 8 Mar 2022 06:09:43 +0000 Subject: [PATCH 10/17] Upgrade to v2.21.3 --- conf/app.src | 6 +++--- manifest.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 0162adc..4369e89 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.21.2.tar.gz -SOURCE_SUM=7cc78aefca4b10d61d1910ed7aaaad19f4b0298dff642c8600cebdc559ecb874 +SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.21.3.tar.gz +SOURCE_SUM=421a11cfc028666d5779d90a470018c8eba7c0cad0abc185c75329231ea18685 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=2 +SOURCE_IN_SUBDIR=true SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index c6b7f54..91ef039 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Blog publishing application", "fr": "Moteur de blog" }, - "version": "2.21.2~ynh1", + "version": "2.21.3~ynh1", "license": "GPL-2.0-or-later", "url": "https://dotclear.org/", "upstream": { From 9308c908fcd9b428fc9d1fadc2585c026feb967b Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 8 Mar 2022 06:09:47 +0000 Subject: [PATCH 11/17] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 841f1a1..f83b1ef 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Blog publishing application -**Shipped version:** 2.21.2~ynh1 +**Shipped version:** 2.21.3~ynh1 **Demo:** https://www.softaculous.com/demos/Dotclear diff --git a/README_fr.md b/README_fr.md index c8d8622..f1918b8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Moteur de blog -**Version incluse :** 2.21.2~ynh1 +**Version incluse :** 2.21.3~ynh1 **Démo :** https://www.softaculous.com/demos/Dotclear From 3527da3b8f5cd48299d3b7f9aba25991aa72de96 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 14 May 2022 06:28:53 +0000 Subject: [PATCH 12/17] Upgrade to v2.22 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 4369e89..7294eba 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.21.3.tar.gz -SOURCE_SUM=421a11cfc028666d5779d90a470018c8eba7c0cad0abc185c75329231ea18685 +SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.22.tar.gz +SOURCE_SUM=0f704078c5c35e70b96d15ca44ace5bc1566b252adc37d2642d7bdd7c9d1a76c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 91ef039..4d9e680 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Blog publishing application", "fr": "Moteur de blog" }, - "version": "2.21.3~ynh1", + "version": "2.22~ynh1", "license": "GPL-2.0-or-later", "url": "https://dotclear.org/", "upstream": { From f77313fd6f6a0cecec02f5fa6701d25a07279968 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 14 May 2022 06:28:57 +0000 Subject: [PATCH 13/17] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f83b1ef..bb5694a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Blog publishing application -**Shipped version:** 2.21.3~ynh1 +**Shipped version:** 2.22~ynh1 **Demo:** https://www.softaculous.com/demos/Dotclear diff --git a/README_fr.md b/README_fr.md index f1918b8..8771aab 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Moteur de blog -**Version incluse :** 2.21.3~ynh1 +**Version incluse :** 2.22~ynh1 **Démo :** https://www.softaculous.com/demos/Dotclear From 771eae7ef15b25adb6dc3ccf9f89ae6541c405ea Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 30 May 2022 16:06:29 +0200 Subject: [PATCH 14/17] Fix source --- conf/app.src | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 7294eba..0c6258f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.22.tar.gz -SOURCE_SUM=0f704078c5c35e70b96d15ca44ace5bc1566b252adc37d2642d7bdd7c9d1a76c +SOURCE_URL=https://download.dotclear.org/latest/dotclear-2.22.zip +SOURCE_SUM=94895d2479654c233f9b269a007ebb36bcf8cba34f4c1071424957f79b90ad6f SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz +SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true SOURCE_FILENAME= SOURCE_EXTRACT=true From f1fc12c5cf434851b6ce09d648a5e0063315f347 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 30 May 2022 16:06:42 +0200 Subject: [PATCH 15/17] Apply last example_ynh --- check_process | 4 ++-- conf/nginx.conf | 5 ----- manifest.json | 14 ++++++-------- scripts/install | 6 ++++-- scripts/remove | 2 +- scripts/restore | 4 +--- 6 files changed, 14 insertions(+), 21 deletions(-) diff --git a/check_process b/check_process index 4fe9fe2..8e1aba9 100644 --- a/check_process +++ b/check_process @@ -2,8 +2,8 @@ ; Manifest domain="domain.tld" path="/path" - admin="john" is_public=1 + admin="john" ; Checks pkg_linter=1 setup_sub_dir=1 @@ -12,7 +12,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6 + upgrade=1 from_commit=f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6 backup_restore=1 multi_instance=1 port_already_use=0 diff --git a/conf/nginx.conf b/conf/nginx.conf index f1d5c49..b26a6dc 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,11 +4,6 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file diff --git a/manifest.json b/manifest.json index 4d9e680..fa1f015 100644 --- a/manifest.json +++ b/manifest.json @@ -7,7 +7,6 @@ "fr": "Moteur de blog" }, "version": "2.22~ynh1", - "license": "GPL-2.0-or-later", "url": "https://dotclear.org/", "upstream": { "license": "GPL-2.0-or-later", @@ -16,6 +15,7 @@ "admindoc": "https://dotclear.org/documentation/2.0", "code": "https://git.dotclear.org/dev/dotclear" }, + "license": "GPL-2.0-or-later", "maintainer": { "name": "kay0u", "email": "pierre@kayou.io" @@ -33,8 +33,7 @@ "install": [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", @@ -42,15 +41,14 @@ "example": "/dotclear2", "default": "/dotclear2" }, - { - "name": "admin", - "type": "user", - "example": "johndoe" - }, { "name": "is_public", "type": "boolean", "default": true + }, + { + "name": "admin", + "type": "user" } ] } diff --git a/scripts/install b/scripts/install index 59f7b7d..cb124d7 100755 --- a/scripts/install +++ b/scripts/install @@ -53,7 +53,7 @@ ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_script_progression --message="Configuring system user..." --weight=2 # Create a system user -ynh_system_user_create --username=$app --home_dir=$final_path +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # CREATE A MYSQL DATABASE @@ -64,7 +64,6 @@ db_name=$(ynh_sanitize_dbid --db_name=$app) db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name - db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) #================================================= @@ -107,6 +106,8 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# SPECIFIC SETUP #================================================= # ADD A CONFIGURATION #================================================= @@ -171,6 +172,7 @@ chown $app:$app "$php_config" #================================================= # SETUP APPLICATION WITH CURL #================================================= +ynh_script_progression --message="Setuping application with CURL..." # Set the app as temporarily public for curl call ynh_script_progression --message="Configuring SSOwat..." diff --git a/scripts/remove b/scripts/remove index b0ef127..f2a4bf0 100755 --- a/scripts/remove +++ b/scripts/remove @@ -58,7 +58,7 @@ ynh_remove_fpm_config #================================================= # REMOVE FAIL2BAN CONFIGURATION #================================================= -ynh_script_progression --message="Removing Fail2ban configuration..." +ynh_script_progression --message="Removing Fail2Ban configuration..." # Remove the dedicated Fail2Ban config ynh_remove_fail2ban_config diff --git a/scripts/restore b/scripts/restore index aa9e6a2..619a437 100755 --- a/scripts/restore +++ b/scripts/restore @@ -36,8 +36,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " @@ -56,7 +54,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_script_progression --message="Recreating the dedicated system user..." --weight=2 # Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir=$final_path +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # RESTORE THE APP MAIN DIR From a73d519f413a7e71941853c125c1e6ebf0754487 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 30 May 2022 14:06:49 +0000 Subject: [PATCH 16/17] Auto-update README --- README.md | 19 ++++++++++--------- README_fr.md | 25 +++++++++++++++---------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index bb5694a..d3b1550 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # DotClear 2 for YunoHost -[![Integration level](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Working status](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) [![Install DotClear 2 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) *[Lire ce readme en français.](./README_fr.md)* @@ -23,7 +23,7 @@ Blog publishing application ## Screenshots -![](./doc/screenshots/ss2_dotclear.png) +![Screenshot of DotClear 2](./doc/screenshots/ss2_dotclear.png) ## Disclaimers / important information @@ -39,21 +39,22 @@ Can the app be used by multiple users? **Yes** ## Documentation and resources -* Official app website: https://dotclear.org -* Official admin documentation: https://dotclear.org/documentation/2.0 -* Upstream app code repository: https://git.dotclear.org/dev/dotclear -* YunoHost documentation for this app: https://yunohost.org/app_dotclear2 -* Report a bug: https://github.com/YunoHost-Apps/dotclear2_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug or sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 8771aab..1219eb0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # DotClear 2 pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) [![Installer DotClear 2 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer DotClear 2 rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -19,7 +23,7 @@ Moteur de blog ## Captures d'écran -![](./doc/screenshots/ss2_dotclear.png) +![Capture d'écran de DotClear 2](./doc/screenshots/ss2_dotclear.png) ## Avertissements / informations importantes @@ -35,21 +39,22 @@ Can the app be used by multiple users? **Yes** ## Documentations et ressources -* Site officiel de l'app : https://dotclear.org -* Documentation officielle de l'admin : https://dotclear.org/documentation/2.0 -* Dépôt de code officiel de l'app : https://git.dotclear.org/dev/dotclear -* Documentation YunoHost pour cette app : https://yunohost.org/app_dotclear2 -* Signaler un bug : https://github.com/YunoHost-Apps/dotclear2_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug ou sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From 57d894fb220f42d553f6ef0d7e3b109bbb01d800 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 8 Jun 2022 01:25:47 +0200 Subject: [PATCH 17/17] Update updater.sh --- .github/workflows/updater.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 2b0a013..5e4fcd1 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -16,9 +16,8 @@ # Fetching information current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') - -asset=$(curl --silent "https://download.dotclear.org/latest/" | grep "dotclear-.*?.tar.gz" -Po | head -1) -version=${asset%.tar.gz} +asset=$(curl --silent "https://download.dotclear.org/latest/" | grep "dotclear-.*?.zip" -Po | head -1) +version=${asset%.zip} version=${version#dotclear-} # Later down the script, we assume the version has only digits and dots @@ -55,20 +54,20 @@ src="app" tempdir="$(mktemp -d)" # Download sources and calculate checksum -curl --silent -4 -L http://download.dotclear.org/latest/dotclear-$version.tar.gz -o "$tempdir/$asset" +curl --silent -4 -L http://download.dotclear.org/latest/dotclear-$version.zip -o "$tempdir/$asset" checksum=$(sha256sum "$tempdir/$asset" | head -c 64) # Delete temporary directory rm -rf $tempdir # Get extension -if [[ $asset == *.tar.gz ]]; then - extension=tar.gz +if [[ $asset == *.zip ]]; then + extension=zip fi # Rewrite source file cat < conf/$src.src -SOURCE_URL=http://download.dotclear.org/latest/dotclear-$version.tar.gz +SOURCE_URL=http://download.dotclear.org/latest/dotclear-$version.zip SOURCE_SUM=$checksum SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=$extension