From 16437107cbe8af92a8b2545042a020b0b060c31c Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 4 Sep 2020 20:19:17 +0200 Subject: [PATCH 1/9] Upgrade to 2.1.0 --- README.md | 2 +- conf/arm.src | 6 +++--- conf/arm64.src | 6 +++--- conf/x86-64.src | 6 +++--- manifest.json | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index e3eda20..b54c708 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post - Tootdon (Android + iOS) - Tootle (iOS) -**Shipped version:** 2.0.7 +**Shipped version:** 2.1.0 ## Important points to read before installing diff --git a/conf/arm.src b/conf/arm.src index 30f0fb5..a732f2a 100644 --- a/conf/arm.src +++ b/conf/arm.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/126024/artifacts/download -SOURCE_SUM=765faec1323d25d399ce3b34030dfccedb1d0f55a54e14e6d6dfdc7812df65f0 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/148066/artifacts/download +SOURCE_SUM=d43365ec0832cf3ae44393597d9d47c2f73579c7436f872aed7442084edb9bf5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v2.0.7-arm.zip +SOURCE_FILENAME=pleroma-v2.1.0-arm.zip diff --git a/conf/arm64.src b/conf/arm64.src index c24cf8f..80a98f0 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/126026/artifacts/download -SOURCE_SUM=cefb340415978a3379564ec93f9c168c3c60bcc73032970e5a5a3dc490b4e712 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/148068/artifacts/download +SOURCE_SUM=5f6f15825b8f013f8cafc7b9402caf87ba8cd4116bf419335b7fae0f011bd93c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v2.0.7-arm64.zip +SOURCE_FILENAME=pleroma-v2.1.0-arm64.zip diff --git a/conf/x86-64.src b/conf/x86-64.src index 991e9e1..6eb6a7f 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/126022/artifacts/download -SOURCE_SUM=5698798b4c38e05ca273381265dfe3988ed96344a52b2d1418c65ccf3f1dfed5 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/148064/artifacts/download +SOURCE_SUM=071f7f179ede3724b82f0b82b455c1cf76f291787b3c83364f26eea17fccc754 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v2.0.7-x86-64.zip +SOURCE_FILENAME=pleroma-v2.1.0-x86-64.zip diff --git a/manifest.json b/manifest.json index e308137..e955624 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "An OStatus-compatible social networking server written in Elixir, compatible with GNU Social and Mastodon", "fr": "Un réseau social écrit en Elixir, compatible avec OStatus, GNU Social et Mastodon" }, - "version": "2.0.7~ynh1", + "version": "2.1.0~ynh1", "url": "https://git.pleroma.social/pleroma/pleroma", "license": "AGPL-3.0-only", "maintainer": [ From cb1f2b79131cf225dfb306e234be49f853f3f9ad Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 6 Sep 2020 14:39:56 +0200 Subject: [PATCH 2/9] Update check_process --- check_process | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/check_process b/check_process index 66fd563..0602551 100755 --- a/check_process +++ b/check_process @@ -43,6 +43,8 @@ # upgrade=1 from_commit=06f0005707e77fae566fedbd6e5e37f390df5173 # 2.0.5~ynh2 upgrade=1 from_commit=30696599937984e9879da22220253f005e290cd0 + # 2.0.7~ynh1 + upgrade=1 from_commit=e8a4a37c2fa35255d0ca3927df8da09e3c5829b6 backup_restore=1 multi_instance=0 # 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. @@ -78,3 +80,5 @@ Notification=yes name=2.0.5~ynh1 ; commit=30696599937984e9879da22220253f005e290cd0 name=2.0.5~ynh2 + ; commit=e8a4a37c2fa35255d0ca3927df8da09e3c5829b6 + name=2.0.7~ynh1 From 94c7f4476d96b6404545c81a03192a02191e32be Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 8 Oct 2020 00:35:52 +0200 Subject: [PATCH 3/9] Upgrade to 2.1.2 --- README.md | 2 +- conf/arm.src | 6 +++--- conf/arm64.src | 6 +++--- conf/x86-64.src | 6 +++--- manifest.json | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index b54c708..eb546be 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post - Tootdon (Android + iOS) - Tootle (iOS) -**Shipped version:** 2.1.0 +**Shipped version:** 2.1.2 ## Important points to read before installing diff --git a/conf/arm.src b/conf/arm.src index a732f2a..29310b0 100644 --- a/conf/arm.src +++ b/conf/arm.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/148066/artifacts/download -SOURCE_SUM=d43365ec0832cf3ae44393597d9d47c2f73579c7436f872aed7442084edb9bf5 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/154864/artifacts/download +SOURCE_SUM=7fd88626e07d728ba7280d24a9e8d3a0dac13096a89013c1b0108506cd718efc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v2.1.0-arm.zip +SOURCE_FILENAME=pleroma-v2.1.2-arm.zip diff --git a/conf/arm64.src b/conf/arm64.src index 80a98f0..242df2c 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/148068/artifacts/download -SOURCE_SUM=5f6f15825b8f013f8cafc7b9402caf87ba8cd4116bf419335b7fae0f011bd93c +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/154866/artifacts/download +SOURCE_SUM=ca1b06753bb0538bf731699c9e91fd43fee8b070a379931ac2de0610dd828bd7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v2.1.0-arm64.zip +SOURCE_FILENAME=pleroma-v2.1.2-arm64.zip diff --git a/conf/x86-64.src b/conf/x86-64.src index 6eb6a7f..bc10baa 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/148064/artifacts/download -SOURCE_SUM=071f7f179ede3724b82f0b82b455c1cf76f291787b3c83364f26eea17fccc754 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/154862/artifacts/download +SOURCE_SUM=1fb0554035144011f02524672c142e688645c90758055e6a043b7042a3126598 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v2.1.0-x86-64.zip +SOURCE_FILENAME=pleroma-v2.1.2-x86-64.zip diff --git a/manifest.json b/manifest.json index bd11ee2..1b3fe32 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A free, federated social networking server built on open protocols.", "fr": "Un serveur de réseautage social fédéré et gratuit basé sur des protocoles ouverts." }, - "version": "2.1.0~ynh1", + "version": "2.1.2~ynh1", "url": "https://git.pleroma.social/pleroma/pleroma", "license": "AGPL-3.0-only", "maintainer": [ From dbce35860b19df6878601d7b27100729910a48de Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 8 Oct 2020 00:36:20 +0200 Subject: [PATCH 4/9] Installing optional packages --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 31f2804..a3b221c 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="curl unzip libncurses5 postgresql postgresql-contrib" +pkg_dependencies="curl unzip libncurses5 postgresql postgresql-contrib imagemagick ffmpeg libimage-exiftool-perl" #================================================= # PERSONAL HELPERS From 1788092dd38ac9a83b9f4a4848972527f00b7bae Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 18 Oct 2020 13:08:39 +0200 Subject: [PATCH 5/9] Limit to buster --- scripts/install | 4 ++++ scripts/restore | 4 ++++ scripts/upgrade | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/scripts/install b/scripts/install index 7816a33..b63d6b4 100755 --- a/scripts/install +++ b/scripts/install @@ -50,6 +50,10 @@ app=$YNH_APP_INSTANCE_NAME #================================================= ynh_script_progression --message="Validating installation parameters..." +if [ "$(lsb_release --codename --short)" != "buster" ]; then + ynh_die --message="Sorry, but this app can only be installed on Buster :(" +fi + final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" diff --git a/scripts/restore b/scripts/restore index c4e556c..e2139fa 100755 --- a/scripts/restore +++ b/scripts/restore @@ -42,6 +42,10 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= ynh_script_progression --message="Validating restoration parameters..." +if [ "$(lsb_release --codename --short)" != "buster" ]; then + ynh_die --message="Sorry, but this app can only be installed on Buster :(" +fi + ynh_webpath_available --domain=$domain --path_url=$path_url \ || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ diff --git a/scripts/upgrade b/scripts/upgrade index f3b3455..6d3465e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -46,6 +46,10 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." +if [ "$(lsb_release --codename --short)" != "buster" ]; then + ynh_die --message="Sorry, but this app can only be installed on Buster :(" +fi + # Fix is_public as a boolean value if [ "$is_public" = "Yes" ]; then ynh_app_setting_set --app=$app --key=is_public --value=1 From 4f6c96de08ad9090e12c219e9575221f6b7ca76c Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 18 Oct 2020 19:42:12 +0200 Subject: [PATCH 6/9] typo --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index b63d6b4..37cc0f5 100755 --- a/scripts/install +++ b/scripts/install @@ -40,7 +40,7 @@ admin_email=$(ynh_user_get_info --username=$admin --key="mail") ## Bypass package_checker name not compatible with pleroma if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then - admin="test" + admin="test" fi app=$YNH_APP_INSTANCE_NAME diff --git a/scripts/restore b/scripts/restore index e2139fa..6408e6a 100755 --- a/scripts/restore +++ b/scripts/restore @@ -43,7 +43,7 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) ynh_script_progression --message="Validating restoration parameters..." if [ "$(lsb_release --codename --short)" != "buster" ]; then - ynh_die --message="Sorry, but this app can only be installed on Buster :(" + ynh_die --message="Sorry, but this app can only be restored on Buster :(" fi ynh_webpath_available --domain=$domain --path_url=$path_url \ diff --git a/scripts/upgrade b/scripts/upgrade index 6d3465e..da30703 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,7 +47,7 @@ upgrade_type=$(ynh_check_app_version_changed) ynh_script_progression --message="Ensuring downward compatibility..." if [ "$(lsb_release --codename --short)" != "buster" ]; then - ynh_die --message="Sorry, but this app can only be installed on Buster :(" + ynh_die --message="Sorry, but this app can only be upgraded on Buster :(" fi # Fix is_public as a boolean value From 145137da06169cdcb6e8b25635cd84e5ac49797d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 28 Oct 2020 00:06:12 +0100 Subject: [PATCH 7/9] Limit to buster --- manifest.json | 2 +- scripts/install | 4 ---- scripts/restore | 4 ---- scripts/upgrade | 4 ---- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/manifest.json b/manifest.json index 1b3fe32..fb04a7f 100755 --- a/manifest.json +++ b/manifest.json @@ -18,7 +18,7 @@ "name": "yalh76" }], "requirements": { - "yunohost": ">= 3.5" + "yunohost": ">= 4" }, "multi_instance": false, "services": [ diff --git a/scripts/install b/scripts/install index 37cc0f5..515f889 100755 --- a/scripts/install +++ b/scripts/install @@ -50,10 +50,6 @@ app=$YNH_APP_INSTANCE_NAME #================================================= ynh_script_progression --message="Validating installation parameters..." -if [ "$(lsb_release --codename --short)" != "buster" ]; then - ynh_die --message="Sorry, but this app can only be installed on Buster :(" -fi - final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" diff --git a/scripts/restore b/scripts/restore index 6408e6a..c4e556c 100755 --- a/scripts/restore +++ b/scripts/restore @@ -42,10 +42,6 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= ynh_script_progression --message="Validating restoration parameters..." -if [ "$(lsb_release --codename --short)" != "buster" ]; then - ynh_die --message="Sorry, but this app can only be restored on Buster :(" -fi - ynh_webpath_available --domain=$domain --path_url=$path_url \ || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ diff --git a/scripts/upgrade b/scripts/upgrade index da30703..f3b3455 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -46,10 +46,6 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." -if [ "$(lsb_release --codename --short)" != "buster" ]; then - ynh_die --message="Sorry, but this app can only be upgraded on Buster :(" -fi - # Fix is_public as a boolean value if [ "$is_public" = "Yes" ]; then ynh_app_setting_set --app=$app --key=is_public --value=1 From 7b05a823b383658226f7af7b05169fd0be5c3c87 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 29 Oct 2020 23:41:55 +0100 Subject: [PATCH 8/9] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index fb04a7f..813d765 100644 --- a/manifest.json +++ b/manifest.json @@ -18,7 +18,7 @@ "name": "yalh76" }], "requirements": { - "yunohost": ">= 4" + "yunohost": ">= 4.0" }, "multi_instance": false, "services": [ From f33212aa253aab2daee3c3f6047184e828e8d4fe Mon Sep 17 00:00:00 2001 From: narF Date: Sun, 1 Nov 2020 19:49:41 -0500 Subject: [PATCH 9/9] Update README.md Add warning about special characters in admin password. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e3eda20..a310f62 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post 1. **Pleroma** require a dedicated **root domain**, eg. pleroma.domain.tld 1. **Pleroma** require a valid **certificate** installed on the domain. Yunohost can **install Letsencrypt certificate** on the domain from **admin web-interface** or through **command-line**. 1. This package is **multi-instance** that means you can run **multiple Pleroma instances** on a **single server**. +1. The admin **password** entered when installing must **not** contain **special characters**. (See [issue #132](https://github.com/YunoHost-Apps/pleroma_ynh/issues/132)) ## Screenshots