From 7c3680c82b9c3f2449c6dbb346a5729a18636ac1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 18 Mar 2020 01:15:56 +0100 Subject: [PATCH 1/5] Upgrade to 2.0.1 --- README.md | 2 +- conf/arm.src | 6 +++--- conf/arm64.src | 6 +++--- conf/media.conf | 2 -- conf/x86-64.src | 6 +++--- manifest.json | 2 +- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 1beaeb8..d9640f6 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post - Tootdon (Android + iOS) - Tootle (iOS) -**Shipped version:** 2.0.0 +**Shipped version:** 2.0.1 ## Important points to read before installing diff --git a/conf/arm.src b/conf/arm.src index 5bfdee4..128c732 100644 --- a/conf/arm.src +++ b/conf/arm.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/100179/artifacts/download -SOURCE_SUM=ed4256dd42f6dcabbf61f92e8238a20c83802356f7da44ff80b5d1cf209d3292 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/101645/artifacts/download +SOURCE_SUM=f59734f594db8d5a7574b895e5749f2abb7ff0464811939e7b80a1d1ff96469c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v2.0.0-arm.zip +SOURCE_FILENAME=pleroma-v2.0.1-arm.zip diff --git a/conf/arm64.src b/conf/arm64.src index 0164b02..4d4cf48 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/100181/artifacts/download -SOURCE_SUM=aa0cfdc2634eb8f9e8ef26bcf01ba8280f41373138b8f14fd5129815cbf76c02 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/101647/artifacts/download +SOURCE_SUM=ed4899121afe07aaefcbaee5a57553d9ded5ce4527078f93540b779f3800789d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v2.0.0-arm64.zip +SOURCE_FILENAME=pleroma-v2.0.1-arm64.zip diff --git a/conf/media.conf b/conf/media.conf index 550fae5..2e2d840 100644 --- a/conf/media.conf +++ b/conf/media.conf @@ -9,8 +9,6 @@ proxy_ignore_client_abort on; proxy_buffering on; chunked_transfer_encoding on; - proxy_ignore_headers Cache-Control; - proxy_hide_header Cache-Control; proxy_pass http://localhost:__PORT__; } diff --git a/conf/x86-64.src b/conf/x86-64.src index 71990de..647a746 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/100177/artifacts/download -SOURCE_SUM=daada8893d8afa515c4c50967d411d39186632d540851ff9e8581ffef02b417c +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/101643/artifacts/download +SOURCE_SUM=b21b2c92409a397e62598fd64f0c156d6f9e4137e815e2a4918d4cc973d25ef7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v2.0.0-x86-64.zip +SOURCE_FILENAME=pleroma-v2.0.1-x86-64.zip diff --git a/manifest.json b/manifest.json index 4dfa32f..2d8864f 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Pleroma is an OStatus-compatible social networking server written in Elixir, compatible with GNU Social and Mastodon", "fr": "Pleroma est un réseau social écrit en Elixir, compatible avec OStatus, GNU Social et Mastodon" }, - "version": "2.0.0~ynh1", + "version": "2.0.1~ynh1", "url": "https://git.pleroma.social/pleroma/pleroma", "license": "AGPL-3.0-only", "maintainer": [ From f23fcb383df57820d6ba6815bdcc9b2dde4a039c Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 6 Apr 2020 20:39:56 +0200 Subject: [PATCH 2/5] fix documentation link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d9640f6..3707b46 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ You can make users **moderators**. They will then be able to **delete any post** ## Documentation - * Official documentation: https://git.pleroma.social/pleroma/pleroma/wikis/home + * Official documentation: https://docs.pleroma.social/ * Yunohost apps documentation: https://yunohost.org/#/app_pleroma ## YunoHost specific features From cc0d9ffd5f2499076f175215460d3fd55e1af258 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 6 Apr 2020 21:58:09 +0200 Subject: [PATCH 3/5] Fix #113 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3707b46..c5ced37 100644 --- a/README.md +++ b/README.md @@ -49,13 +49,13 @@ Go to **cd /var/www/pleroma/pleroma**. **Run:** - $ ( cd /var/www/pleroma/pleroma && sudo -u pleroma MIX_ENV=prod mix pleroma.user new ) + $ ( cd /var/www/pleroma/pleroma && sudo -u pleroma MIX_ENV=prod ./bin/pleroma_ctl user new ) ### Password reset **Run:** - $ ( cd /var/www/pleroma/pleroma && sudo -u pleroma MIX_ENV=prod mix pleroma.user reset_password ) + $ ( cd /var/www/pleroma/pleroma && sudo -u pleroma MIX_ENV=prod ./bin/pleroma_ctl user reset_password ) This will generate a **password reset link** that you can then send to the user. @@ -65,7 +65,7 @@ You can make users **moderators**. They will then be able to **delete any post** **Run:** - $ ( cd /var/www/pleroma/pleroma && sudo -u pleroma MIX_ENV=prod mix pleroma.user set --[no-]admin ) + $ ( cd /var/www/pleroma/pleroma && sudo -u pleroma MIX_ENV=prod ./bin/pleroma_ctl user set --[no-]admin ) **--admin** option will **make the user moderator** and **--no-admin** will **take away the moderator privileges** from the user. From fa0d01883c011a57a9f7c732489da956a6fa7b91 Mon Sep 17 00:00:00 2001 From: ulecrivain <43913579+ulecrivain@users.noreply.github.com> Date: Mon, 6 Apr 2020 23:36:33 +0200 Subject: [PATCH 4/5] Update systemd.service disabling ProtectHome since install script puts pleroma datadir in /home --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 4f0cc2c..a76f0d4 100755 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -23,7 +23,7 @@ ExecStop=__FINALPATH__/__APP__/bin/pleroma stop ; Use private /tmp and /var/tmp folders inside a new file system namespace, which are discarded after the process stops. PrivateTmp=true ; The /home, /root, and /run/user folders can not be accessed by this service anymore. If your Pleroma user has its home folder in one of the restricted places, or use one of these folders as its working directory, you have to set this to false. -ProtectHome=true +ProtectHome=false ; Mount /usr, /boot, and /etc as read-only for processes invoked by this service. ProtectSystem=full ; Sets up a new /dev mount for the process and only adds API pseudo devices like /dev/null, /dev/zero or /dev/random but not physical devices. Disabled by default because it may not work on devices like the Raspberry Pi. From 4bc70dbec7838b8c9c5273bddfd79a43878fff95 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 7 Apr 2020 00:03:00 +0200 Subject: [PATCH 5/5] increase version number --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 2d8864f..eec00d0 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Pleroma is an OStatus-compatible social networking server written in Elixir, compatible with GNU Social and Mastodon", "fr": "Pleroma est un réseau social écrit en Elixir, compatible avec OStatus, GNU Social et Mastodon" }, - "version": "2.0.1~ynh1", + "version": "2.0.1~ynh2", "url": "https://git.pleroma.social/pleroma/pleroma", "license": "AGPL-3.0-only", "maintainer": [