From 5ddaf96ef598ec71647d01529aaa48e0ca40e1b7 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 6 Jan 2021 01:56:11 +0100 Subject: [PATCH 1/7] Upgrade to 0.6.0~ynh1 --- README.md | 2 +- check_process | 4 ++++ conf/.env | 9 +++++++++ conf/arm64.src | 2 +- conf/x86-64.src | 4 ++-- manifest.json | 2 +- 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fa70f0a..c0457ee 100755 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Federated blogging engine, based on ActivityPub. It uses the Rocket framework, and Diesel to interact with the database. -**Shipped version:** 0.5.0 +**Shipped version:** 0.6.0 **Warning:** The package can take **15 to 30 minutes** to complete depending on your system configuration. **Don't intrupt the installation process while installing.** diff --git a/check_process b/check_process index b6152d9..b8ce1a8 100755 --- a/check_process +++ b/check_process @@ -18,6 +18,8 @@ upgrade=1 from_commit=279716dff5fc79cc84ae2d7799c8094017ac028e # 0.4.0-alpha-4~ynh1 upgrade=1 from_commit=e99273dfb8df763ebbd41d51ee34d92776dfcbf0 + # 0.5.0~ynh1 + upgrade=1 from_commit=457f1dd7719286f28755d9561133a8e176be63c7 backup_restore=1 multi_instance=1 # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. @@ -35,3 +37,5 @@ Notification=yes name=0.3.0-alpha-2~ynh1 ; commit=e99273dfb8df763ebbd41d51ee34d92776dfcbf0 name=0.4.0-alpha-4~ynh1 + ; commit=457f1dd7719286f28755d9561133a8e176be63c7 + name=0.5.0~ynh1 diff --git a/conf/.env b/conf/.env index ffb27a1..3606021 100755 --- a/conf/.env +++ b/conf/.env @@ -45,3 +45,12 @@ MAIL_HELO_NAME=no-reply@__DOMAIN__ #PLUME_LOGO_192=icons/trwnh/paragraphs/plumeParagraphs192.png #PLUME_LOGO_256=icons/trwnh/paragraphs/plumeParagraphs256.png #PLUME_LOGO_512=icons/trwnh/paragraphs/plumeParagraphs512.png + +## LDAP CONFIG ## +# the object that will be bound is "${USER_NAME_ATTR}=${username},${BASE_DN}" +LDAP_ADDR=ldap://127.0.0.1:1389 +LDAP_BASE_DN="ou=users,dc=yunohost,dc=org" +LDAP_USER_NAME_ATTR=uid +LDAP_USER_MAIL_ATTR=mail +LDAP_TLS=false + diff --git a/conf/arm64.src b/conf/arm64.src index cc4490c..8273de7 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/plume_ynh/releases/download/0.5.0/plume-arm64-postgres.tar.gz +SOURCE_URL=https://github.com/YunoHost-Apps/plume_ynh/releases/download/0.6.0/plume-arm64-postgres.tar.gz SOURCE_SUM=bb1a82257520a4973414974accd5f959a004cbc235944837df86d37ff635ec45 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz diff --git a/conf/x86-64.src b/conf/x86-64.src index ef21f9c..8951efd 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Plume-org/Plume/releases/download/0.5.0/plume-postgres.tar.gz -SOURCE_SUM=55858fd955dc3a45e41d44466e529dcf63c1751feea0a63f530dc0113b23ff52 +SOURCE_URL=https://github.com/Plume-org/Plume/releases/download/0.6.0/plume-postgres.tar.gz +SOURCE_SUM=faca15f1b036929fd9c0a5cff29dbf12eb559500ee25052ba716138c5b93e63f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 636e529..85680e8 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Federated blogging application", "fr": "Une application de blogging fédérée." }, - "version": "0.5.0~ynh1", + "version": "0.6.0~ynh1", "url": "https://baptiste.gelez.xyz/", "license": "AGPL-3.0-only", "maintainer": [ From de4ff5c9d74a1c3d159f1402a4f6f0f4fde7b551 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 7 Jan 2021 21:00:02 +0100 Subject: [PATCH 2/7] fix ldap port --- conf/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/.env b/conf/.env index 3606021..8516aa5 100755 --- a/conf/.env +++ b/conf/.env @@ -48,7 +48,7 @@ MAIL_HELO_NAME=no-reply@__DOMAIN__ ## LDAP CONFIG ## # the object that will be bound is "${USER_NAME_ATTR}=${username},${BASE_DN}" -LDAP_ADDR=ldap://127.0.0.1:1389 +LDAP_ADDR=ldap://127.0.0.1:389 LDAP_BASE_DN="ou=users,dc=yunohost,dc=org" LDAP_USER_NAME_ATTR=uid LDAP_USER_MAIL_ATTR=mail From 5a1126cd352f23140cfdc398baef03fa44b3d243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 7 Jan 2021 22:07:04 +0100 Subject: [PATCH 3/7] Set badge to SVG --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c0457ee..5c5a7b5 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# Plume app for Yunohost +# Plume for Yunohost [![Integration level](https://dash.yunohost.org/integration/plume.svg)](https://dash.yunohost.org/appci/app/plume) ![](https://ci-apps.yunohost.org/ci/badges/plume.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/plume.maintain.svg) -[![Install Plume with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=plume) +[![Install Plume with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=plume) > *This package allows you to install Plume 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.* @@ -56,8 +56,7 @@ There is **No LDAP** support for Plume yet but the app can be used by multiple u --- -Developer info ----------------- +## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/plume_ynh/tree/testing). From 03657a680cde4630e98a86f08bf95225f4bcb94c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 7 Jan 2021 22:09:12 +0100 Subject: [PATCH 4/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c5a7b5..5be082b 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Plume for Yunohost +# Plume for YunoHost [![Integration level](https://dash.yunohost.org/integration/plume.svg)](https://dash.yunohost.org/appci/app/plume) ![](https://ci-apps.yunohost.org/ci/badges/plume.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/plume.maintain.svg) [![Install Plume with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=plume) From 1bff15e1a8ab0b5ef1eaf6fb08f533d412399074 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 9 Jan 2021 22:45:41 +0100 Subject: [PATCH 5/7] Finding an available port --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 604dfc6..db6f390 100755 --- a/scripts/install +++ b/scripts/install @@ -73,7 +73,7 @@ ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key #================================================= # FIND AND OPEN A PORT #================================================= -ynh_script_progression --message="Configuring firewall ..." +ynh_script_progression --message="Finding an available port ..." # Find an available port port=$(ynh_find_port --port=8095) From afdab11f442682d869b84b36fd75ad304108f7d2 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 19 Jan 2021 23:01:38 +0100 Subject: [PATCH 6/7] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 85680e8..bc49e74 100755 --- a/manifest.json +++ b/manifest.json @@ -7,7 +7,7 @@ "fr": "Une application de blogging fédérée." }, "version": "0.6.0~ynh1", - "url": "https://baptiste.gelez.xyz/", + "url": "https://joinplu.me/", "license": "AGPL-3.0-only", "maintainer": [ { From ea095def0ea54e830026f4e96b292b9b67e7d44f Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 23 Feb 2021 03:06:56 +0100 Subject: [PATCH 7/7] Update arm64.src --- conf/arm64.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/arm64.src b/conf/arm64.src index 8273de7..ea689bf 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ SOURCE_URL=https://github.com/YunoHost-Apps/plume_ynh/releases/download/0.6.0/plume-arm64-postgres.tar.gz -SOURCE_SUM=bb1a82257520a4973414974accd5f959a004cbc235944837df86d37ff635ec45 +SOURCE_SUM=c821052f0d7c6cbb2d4eeffd143fb36b3add30b57c4bfc442d6604bd43e2f1b2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false