From da405143fdc75bfc19233f9453670c3a4c730764 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 22 Dec 2020 21:25:24 +0100 Subject: [PATCH 1/4] Upgrade to 2.2.0 --- README.md | 2 +- check_process | 4 ++++ conf/arm.src | 6 +++--- conf/arm64.src | 6 +++--- conf/x86-64.src | 6 +++--- manifest.json | 2 +- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 6b08fa0..e53d23c 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.2 +**Shipped version:** 2.2.0 ## Important points to read before installing diff --git a/check_process b/check_process index ed061d6..98254d8 100644 --- a/check_process +++ b/check_process @@ -45,6 +45,8 @@ upgrade=1 from_commit=30696599937984e9879da22220253f005e290cd0 # 2.0.7~ynh1 upgrade=1 from_commit=e13745923a2e06e780e7b9d34ae084f600a9a2a2 + # 2.1.2~ynh1 + upgrade=1 from_commit=ade89203b611fd178bc9d1cf35804bc08ea3a78b 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. @@ -82,3 +84,5 @@ Notification=yes name=2.0.5~ynh2 ; commit=e13745923a2e06e780e7b9d34ae084f600a9a2a2 name=2.0.7~ynh1 + ; commit=ade89203b611fd178bc9d1cf35804bc08ea3a78b + name=2.1.2~ynh1 diff --git a/conf/arm.src b/conf/arm.src index 29310b0..ab1b66c 100644 --- a/conf/arm.src +++ b/conf/arm.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/154864/artifacts/download -SOURCE_SUM=7fd88626e07d728ba7280d24a9e8d3a0dac13096a89013c1b0108506cd718efc +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/165405/artifacts/download +SOURCE_SUM=1c03dac583605ff8d2d52c93f21b9a70088c0c4ba3c4b2a36b27ea5c54d8e0a4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v2.1.2-arm.zip +SOURCE_FILENAME=pleroma-v2.2.0-arm.zip diff --git a/conf/arm64.src b/conf/arm64.src index 242df2c..77e7ecb 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/154866/artifacts/download -SOURCE_SUM=ca1b06753bb0538bf731699c9e91fd43fee8b070a379931ac2de0610dd828bd7 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/165407/artifacts/download +SOURCE_SUM=2bcb5836d12f46698640039b57d1b9b8917e0c59d273be2d3e2057e5ede84ef9 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v2.1.2-arm64.zip +SOURCE_FILENAME=pleroma-v2.2.0-arm64.zip diff --git a/conf/x86-64.src b/conf/x86-64.src index bc10baa..59f31a8 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/154862/artifacts/download -SOURCE_SUM=1fb0554035144011f02524672c142e688645c90758055e6a043b7042a3126598 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/165403/artifacts/download +SOURCE_SUM=4949fb048425e4098094583e7a7cf20403fab8a9edd42d0029e99be8604ba0af SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v2.1.2-x86-64.zip +SOURCE_FILENAME=pleroma-v2.2.0-x86-64.zip diff --git a/manifest.json b/manifest.json index 813d765..df13b1f 100644 --- 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.2~ynh1", + "version": "2.2.0~ynh1", "url": "https://git.pleroma.social/pleroma/pleroma", "license": "AGPL-3.0-only", "maintainer": [ From 72b8ab54a63ecf667ef8b87deebc440dc0fb9c89 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 22 Dec 2020 21:26:57 +0100 Subject: [PATCH 2/4] Adding exiftool --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index a3b221c..eb7558e 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 imagemagick ffmpeg libimage-exiftool-perl" +pkg_dependencies="curl unzip libncurses5 postgresql postgresql-contrib imagemagick ffmpeg exiftool libimage-exiftool-perl" #================================================= # PERSONAL HELPERS From 40239f770d30a2164a700f069d0646fea3bcb0de Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 2 Jan 2021 20:04:20 +0100 Subject: [PATCH 3/4] fix upgrade --- conf/systemd.service | 3 +++ scripts/install | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index a76f0d4..7bc1c47 100755 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -3,12 +3,15 @@ Description=__APP__ social network After=network.target postgresql.service nginx.service [Service] +ExecReload=/bin/kill $MAINPID KillMode=process Restart=on-failure ; Name of the user that runs the Pleroma service. User=__APP__ Group=__APP__ +; Declares that Pleroma runs in production mode. +Environment="MIX_ENV=prod" ; Make sure that all paths fit your installation. ; Path to the home directory of the user running the Pleroma service. diff --git a/scripts/install b/scripts/install index 5a4b37c..306fdd8 100755 --- a/scripts/install +++ b/scripts/install @@ -208,11 +208,14 @@ pushd $final_path/$app --dbpass $db_pwd \ --rum N \ --indexable Y \ + --db-configurable Y \ --uploads-dir $datadir/uploads \ --static-dir $datadir/static \ --listen-ip 127.0.0.1 \ --listen-port $port \ - --db-configurable Y" + --strip-uploads Y \ + --anonymize-uploads Y \ + --dedupe-uploads Y" popd cat "../conf/ldap.exs" >> "$config" From e66b26b4d6a7cbc5fc3b86a2e89176e35589f046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 3 Jan 2021 12:23:48 +0100 Subject: [PATCH 4/4] Set badge to SVG + typos --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6b08fa0..234c956 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# Pleroma app for Yunohost +# Pleroma for YunoHost [![Integration level](https://dash.yunohost.org/integration/pleroma.svg)](https://dash.yunohost.org/appci/app/pleroma) ![](https://ci-apps.yunohost.org/ci/badges/pleroma.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/pleroma.maintain.svg) -[![Install Pleroma with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=pleroma) +[![Install Pleroma with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pleroma) > *This package allows you to install Pleroma 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.* @@ -95,8 +95,7 @@ The app can be used by multiple users. --- -Developer info ----------------- +## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/pleroma_ynh/tree/testing).