Merge pull request #152 from YunoHost-Apps/testing

Testing

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.*
@@ -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
 
@@ -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).
 

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

conf/arm.src

@@ -1,6 +1,6 @@
-SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/154864/artifacts/download
+SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/165405/artifacts/download
-SOURCE_SUM=7fd88626e07d728ba7280d24a9e8d3a0dac13096a89013c1b0108506cd718efc
+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

conf/arm64.src

@@ -1,6 +1,6 @@
-SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/154866/artifacts/download
+SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/165407/artifacts/download
-SOURCE_SUM=ca1b06753bb0538bf731699c9e91fd43fee8b070a379931ac2de0610dd828bd7
+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

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.

conf/x86-64.src

@@ -1,6 +1,6 @@
-SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/154862/artifacts/download
+SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/165403/artifacts/download
-SOURCE_SUM=1fb0554035144011f02524672c142e688645c90758055e6a043b7042a3126598
+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

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": [

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

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"