Merge pull request #233 from YunoHost-Apps/3.2.0

Upgrade to 3.2.0

README.md

@@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 ## Overview
 Mastodon is a free, open-source microblogging social network. It is a decentralized alternative to commercial platforms like Twitter and avoids the risks of a single company monopolizing your communication for commercial purposes. 
 
-**Shipped version:** 3.1.2
+**Shipped version:** 3.2.0 (3.1.2 on Jessie)
 
 ## Important points to read before installing
 

README_fr.md

@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 ## Vue d'ensemble
 Mastodon est un réseau social de microblog auto-hébergé et open source. C'est une alternative décentralisée aux plates-formes commerciales comme Twitter. Mastodon évite ainsi les risques qu'une seule société monopolise votre communication à des fins commerciales.
 
-**Version incluse:** 3.1.2
+**Version incluse:** 3.2.0 (3.1.2 on Jessie)
 
 ## Points importants à lire avant l'installation
 

check_process

@@ -17,6 +17,8 @@
 		upgrade=1	from_commit=7e1f4c2dee5f2c8374686aea62f4648cdf2722c3
 		# 3.1.2~ynh3
 		upgrade=1	from_commit=6b30109fc986d83166b1805ec3ad7e28200e3743
+		# 3.1.2~ynh4
+		upgrade=1	from_commit=d3df899e0a99a63ee1cf7ad845cc513aeaaf30ef
 		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.
@@ -34,3 +36,5 @@ Notification=all
 		name=3.1.2~ynh2
 	; commit=6b30109fc986d83166b1805ec3ad7e28200e3743
 		name=3.1.2~ynh3
+	; commit=d3df899e0a99a63ee1cf7ad845cc513aeaaf30ef
+		name=3.1.2~ynh4

conf/.env.production.sample

@@ -1,69 +1,50 @@
-# Service dependencies
+# This is a sample configuration file. You can generate your configuration
-# You may set REDIS_URL instead for more advanced options
+# with the `rake mastodon:setup` interactive setup wizard, but to customize
-# You may also set REDIS_NAMESPACE to share Redis between multiple Mastodon servers
+# your setup even further, you'll need to edit it manually. This sample does
+# not demonstrate all available configuration options. Please look at
+# https://docs.joinmastodon.org/admin/config/ for the full documentation.
+
+# Federation
+# ----------
+# This identifies your server and cannot be changed safely later
+# ----------
+LOCAL_DOMAIN=__DOMAIN__
+
+# Redis
+# -----
 REDIS_HOST=localhost
 REDIS_PORT=6379
-# You may set DATABASE_URL instead for more advanced options
+
+# PostgreSQL
+# ----------
 DB_HOST=localhost
 DB_USER=__DB_USER__
 DB_NAME=__DB_NAME__
 DB_PASS=__DB_PWD__
 DB_PORT=5432
-# Optional ElasticSearch configuration
+
-# You may also set ES_PREFIX to share the same cluster between multiple Mastodon servers (falls back to REDIS_NAMESPACE if not set)
+# ElasticSearch (optional)
+# ------------------------
 # ES_ENABLED=true
 # ES_HOST=es
 # ES_PORT=9200
 
-# Federation
+# Secrets
-# Note: Changing LOCAL_DOMAIN at a later time will cause unwanted side effects, including breaking all existing federation.
+# -------
-# LOCAL_DOMAIN should *NOT* contain the protocol part of the domain e.g https://example.com.
+# Make sure to use `rake secret` to generate secrets
-LOCAL_DOMAIN=__DOMAIN__
+# -------
-
-# Changing LOCAL_HTTPS in production is no longer supported. (Mastodon will always serve https:// links)
-
-# Use this only if you need to run mastodon on a different domain than the one used for federation.
-# You can read more about this option on https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Serving_a_different_domain.md
-# DO *NOT* USE THIS UNLESS YOU KNOW *EXACTLY* WHAT YOU ARE DOING.
-# WEB_DOMAIN=mastodon.example.com
-
-# Use this if you want to have several aliases handler@example1.com
-# handler@example2.com etc. for the same user. LOCAL_DOMAIN should not
-# be added. Comma separated values
-# ALTERNATE_DOMAINS=example1.com,example2.com
-
-# Application secrets
-# Generate each with the `RAILS_ENV=production bundle exec rake secret` task (`docker-compose run --rm web rake secret` if you use docker compose)
 SECRET_KEY_BASE=__SECRET_KEY_BASE__
 OTP_SECRET=__OTP_SECRET__
 
-# VAPID keys (used for push notifications
+# Web Push
-# You can generate the keys using the following command (first is the private key, second is the public one)
+# --------
-# You should only generate this once per instance. If you later decide to change it, all push subscription will
+# Generate with `rake mastodon:webpush:generate_vapid_key`
-# be invalidated, requiring the users to access the website again to resubscribe.
+# --------
-#
-# Generate with `RAILS_ENV=production bundle exec rake mastodon:webpush:generate_vapid_key` task (`docker-compose run --rm web rake mastodon:webpush:generate_vapid_key` if you use docker compose)
-#
-# For more information visit https://rossta.net/blog/using-the-web-push-api-with-vapid.html
 VAPID_PRIVATE_KEY=__VAPID_PRIVATE_KEY__
 VAPID_PUBLIC_KEY=__VAPID_PUBLIC_KEY__
 
-# Registrations
+# Sending mail
-# Single user mode will disable registrations and redirect frontpage to the first profile
+# ------------
-# SINGLE_USER_MODE=true
-# Prevent registrations with following e-mail domains
-# EMAIL_DOMAIN_BLACKLIST=example1.com|example2.de|etc
-# Only allow registrations with the following e-mail domains
-# EMAIL_DOMAIN_WHITELIST=example1.com|example2.de|etc
-
-# Optionally change default language
-DEFAULT_LOCALE=__LANGUAGE__
-
-# E-mail configuration
-# Note: Mailgun and SparkPost (https://sparkpo.st/smtp) each have good free tiers
-# If you want to use an SMTP server without authentication (e.g local Postfix relay)
-# then set SMTP_AUTH_METHOD and SMTP_OPENSSL_VERIFY_MODE to 'none' and
-# *comment* SMTP_LOGIN and SMTP_PASSWORD (leaving them blank is not enough).
 SMTP_SERVER=localhost
 SMTP_PORT=25
 #SMTP_LOGIN=
@@ -78,22 +59,20 @@ SMTP_OPENSSL_VERIFY_MODE=none
 #SMTP_ENABLE_STARTTLS_AUTO=true
 #SMTP_TLS=true
 
-# Optional user upload path and URL (images, avatars). Default is :rails_root/public/system. If you set this variable, you are responsible for making your HTTP server (eg. nginx) serve these files.
+# Registrations
-# PAPERCLIP_ROOT_PATH=/var/lib/mastodon/public-system
+# ------------
-# PAPERCLIP_ROOT_URL=/system
+# Single user mode will disable registrations and redirect frontpage to the first profile
+# SINGLE_USER_MODE=true
+# Prevent registrations with following e-mail domains
+# EMAIL_DOMAIN_BLACKLIST=example1.com|example2.de|etc
+# Only allow registrations with the following e-mail domains
+# EMAIL_DOMAIN_WHITELIST=example1.com|example2.de|etc
 
-# Optional asset host for multi-server setups
+# Optionally change default language
-# The asset host must allow cross origin request from WEB_DOMAIN or LOCAL_DOMAIN
+DEFAULT_LOCALE=__LANGUAGE__
-# if WEB_DOMAIN is not set. For example, the server may have the
-# following header field:
-# Access-Control-Allow-Origin: https://example.com/
-# CDN_HOST=https://assets.example.com
 
-# S3 (optional)
+# File storage (optional)
-# The attachment host must allow cross origin request from WEB_DOMAIN or
+# -----------------------
-# LOCAL_DOMAIN if WEB_DOMAIN is not set. For example, the server may have the
-# following header field:
-# Access-Control-Allow-Origin: https://192.168.1.123:9000/
 # S3_ENABLED=true
 # S3_BUCKET=
 # AWS_ACCESS_KEY_ID=
@@ -101,75 +80,10 @@ SMTP_OPENSSL_VERIFY_MODE=none
 # S3_REGION=
 # S3_PROTOCOL=http
 # S3_HOSTNAME=192.168.1.123:9000
-
-# S3 (Minio Config (optional) Please check Minio instance for details)
-# The attachment host must allow cross origin request - see the description
-# above.
-# S3_ENABLED=true
-# S3_BUCKET=
-# AWS_ACCESS_KEY_ID=
-# AWS_SECRET_ACCESS_KEY=
-# S3_REGION=
-# S3_PROTOCOL=https
-# S3_HOSTNAME=
-# S3_ENDPOINT=
-# S3_SIGNATURE_VERSION=
-
-# Google Cloud Storage (optional)
-# Use S3 compatible API. Since GCS does not support Multipart Upload,
-# increase the value of S3_MULTIPART_THRESHOLD to disable Multipart Upload.
-# The attachment host must allow cross origin request - see the description
-# above.
-# S3_ENABLED=true
-# AWS_ACCESS_KEY_ID=
-# AWS_SECRET_ACCESS_KEY=
-# S3_REGION=
-# S3_PROTOCOL=https
-# S3_HOSTNAME=storage.googleapis.com
-# S3_ENDPOINT=https://storage.googleapis.com
-# S3_MULTIPART_THRESHOLD=52428801 # 50.megabytes
-
-# Swift (optional)
-# The attachment host must allow cross origin request - see the description
-# above.
-# SWIFT_ENABLED=true
-# SWIFT_USERNAME=
-# For Keystone V3, the value for SWIFT_TENANT should be the project name
-# SWIFT_TENANT=
-# SWIFT_PASSWORD=
-# Some OpenStack V3 providers require PROJECT_ID (optional)
-# SWIFT_PROJECT_ID=
-# Keystone V2 and V3 URLs are supported. Use a V3 URL if possible to avoid
-# issues with token rate-limiting during high load.
-# SWIFT_AUTH_URL=
-# SWIFT_CONTAINER=
-# SWIFT_OBJECT_URL=
-# SWIFT_REGION=
-# Defaults to 'default'
-# SWIFT_DOMAIN_NAME=
-# Defaults to 60 seconds. Set to 0 to disable
-# SWIFT_CACHE_TTL=
-
-# Optional alias for S3 (e.g. to serve files on a custom domain, possibly using Cloudfront or Cloudflare)
 # S3_ALIAS_HOST=
 
-# Streaming API integration
-# STREAMING_API_BASE_URL=
-
-# Advanced settings
-# If you need to use pgBouncer, you need to disable prepared statements:
-# PREPARED_STATEMENTS=false
-
-# Cluster number setting for streaming API server.
-# If you comment out following line, cluster number will be `numOfCpuCores - 1`.
-STREAMING_CLUSTER_NUM=1
-
-# Docker mastodon user
-# If you use Docker, you may want to assign UID/GID manually.
-# UID=1000
-# GID=1000
-
 # LDAP authentication (optional)
+# -----------------------
 LDAP_ENABLED=true
 LDAP_HOST=localhost
 LDAP_PORT=389
@@ -184,80 +98,3 @@ LDAP_UID_CONVERSION_ENABLED=true
 LDAP_UID_CONVERSION_SEARCH=., -
 LDAP_UID_CONVERSION_REPLACE=_
 LDAP_TLS_NO_VERIFY=true
-
-# PAM authentication (optional)
-# PAM authentication uses for the email generation the "email" pam variable
-# and optional as fallback PAM_DEFAULT_SUFFIX
-# The pam environment variable "email" is provided by:
-# https://github.com/devkral/pam_email_extractor
-# PAM_ENABLED=true
-# Fallback email domain for email address generation (LOCAL_DOMAIN by default)
-# PAM_EMAIL_DOMAIN=example.com
-# Name of the pam service (pam "auth" section is evaluated)
-# PAM_DEFAULT_SERVICE=rpam
-# Name of the pam service used for checking if an user can register (pam "account" section is evaluated) (nil (disabled) by default)
-# PAM_CONTROLLED_SERVICE=rpam
-
-# Global OAuth settings (optional) :
-# If you have only one strategy, you may want to enable this
-# OAUTH_REDIRECT_AT_SIGN_IN=true
-
-# Optional CAS authentication (cf. omniauth-cas) :
-# CAS_ENABLED=true
-# CAS_URL=https://sso.myserver.com/
-# CAS_HOST=sso.myserver.com/
-# CAS_PORT=443
-# CAS_SSL=true
-# CAS_VALIDATE_URL=
-# CAS_CALLBACK_URL=
-# CAS_LOGOUT_URL=
-# CAS_LOGIN_URL=
-# CAS_UID_FIELD='user'
-# CAS_CA_PATH=
-# CAS_DISABLE_SSL_VERIFICATION=false
-# CAS_UID_KEY='user'
-# CAS_NAME_KEY='name'
-# CAS_EMAIL_KEY='email'
-# CAS_NICKNAME_KEY='nickname'
-# CAS_FIRST_NAME_KEY='firstname'
-# CAS_LAST_NAME_KEY='lastname'
-# CAS_LOCATION_KEY='location'
-# CAS_IMAGE_KEY='image'
-# CAS_PHONE_KEY='phone'
-
-# Optional SAML authentication (cf. omniauth-saml)
-# SAML_ENABLED=true
-# SAML_ACS_URL=http://localhost:3000/auth/auth/saml/callback
-# SAML_ISSUER=https://example.com
-# SAML_IDP_SSO_TARGET_URL=https://idp.testshib.org/idp/profile/SAML2/Redirect/SSO
-# SAML_IDP_CERT=
-# SAML_IDP_CERT_FINGERPRINT=
-# SAML_NAME_IDENTIFIER_FORMAT=
-# SAML_CERT=
-# SAML_PRIVATE_KEY=
-# SAML_SECURITY_WANT_ASSERTION_SIGNED=true
-# SAML_SECURITY_WANT_ASSERTION_ENCRYPTED=true
-# SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED=true
-# SAML_ATTRIBUTES_STATEMENTS_UID="urn:oid:0.9.2342.19200300.100.1.1"
-# SAML_ATTRIBUTES_STATEMENTS_EMAIL="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
-# SAML_ATTRIBUTES_STATEMENTS_FULL_NAME="urn:oid:2.16.840.1.113730.3.1.241"
-# SAML_ATTRIBUTES_STATEMENTS_FIRST_NAME="urn:oid:2.5.4.42"
-# SAML_ATTRIBUTES_STATEMENTS_LAST_NAME="urn:oid:2.5.4.4"
-# SAML_UID_ATTRIBUTE="urn:oid:0.9.2342.19200300.100.1.1"
-# SAML_ATTRIBUTES_STATEMENTS_VERIFIED=
-# SAML_ATTRIBUTES_STATEMENTS_VERIFIED_EMAIL=
-
-# Use HTTP proxy for outgoing request (optional)
-# http_proxy=http://gateway.local:8118
-# Access control for hidden service.
-# ALLOW_ACCESS_TO_HIDDEN_SERVICE=true
-
-# Authorized fetch mode (optional)
-# Require remote servers to authentify when fetching toots, see
-# https://docs.joinmastodon.org/admin/config/#authorized_fetch
-# AUTHORIZED_FETCH=true
-
-# Whitelist mode (optional)
-# Only allow federation with whitelisted domains, see
-# https://docs.joinmastodon.org/admin/config/#whitelist_mode
-# WHITELIST_MODE=true

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.1.2.tar.gz
+SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.2.0.tar.gz
-SOURCE_SUM=c12fd8c1b426861825d37d2eab1d6356be05b2b321eae0c1b87f80fcc11b0da7 
+SOURCE_SUM=7ab99ccc6d6ce2ac2d5aea82a2fc057dd357126cb572e4fb39531931dc078904 
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

conf/jessie.src

@@ -0,0 +1,6 @@
+SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.1.2.tar.gz
+SOURCE_SUM=c12fd8c1b426861825d37d2eab1d6356be05b2b321eae0c1b87f80fcc11b0da7 
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=tar.gz
+SOURCE_IN_SUBDIR=true
+SOURCE_FILENAME=

manifest.json

@@ -6,7 +6,7 @@
         "en": "A libre and federated social network.",
         "fr": "Un réseau social libre et fédéré."
     },
-    "version": "3.1.2~ynh4",
+    "version": "3.2.0~ynh1",
     "url": "https://github.com/tootsuite/mastodon",
     "license": "AGPL-3.0-or-later",
     "maintainer": [

scripts/_common.sh

@@ -7,14 +7,18 @@
 # dependencies used by the app
 pkg_dependencies="imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git-core g++ libprotobuf-dev protobuf-compiler pkg-config gcc autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm3|libgdbm6 libgdbm-dev redis-server redis-tools postgresql postgresql-contrib libidn11-dev libicu-dev libjemalloc-dev curl apt-transport-https"
 
-RUBY_VERSION="2.6.5"
-
-BUNDLER_VERSION="1.17.3"
-
-NODEJS_VERSION="10"
-
 MEMORY_NEEDED="2560"
 
+if [ "$(lsb_release --codename --short)" = "buster" ]; then
+    RUBY_VERSION="2.6.6"
+    BUNDLER_VERSION="1.17.3"
+    NODEJS_VERSION="12"
+else
+    RUBY_VERSION="2.6.5"
+    BUNDLER_VERSION="1.17.3"
+    NODEJS_VERSION="10"
+fi
+
 #=================================================
 # PERSONAL HELPERS
 #=================================================

scripts/install

@@ -103,10 +103,17 @@ ynh_script_progression --message="Setting up source files..."
 ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
 mkdir $final_path
-ynh_setup_source --dest_dir="$final_path/live"
 
-# Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292
+if [ "$(lsb_release --codename --short)" = "buster" ]; then
-ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock"
+    ynh_setup_source --dest_dir="$final_path/live"
+else
+    ynh_script_progression --message="Setting up source files..."
+
+    ynh_setup_source --dest_dir="$final_path/live" --source_id=jessie
+    
+    # Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292
+    ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock"
+fi
 
 #=================================================
 # NGINX CONFIGURATION

scripts/upgrade

@@ -183,10 +183,16 @@ then
 	fi
 	rsync -a "$config" "$tmpdir/."
 	ynh_secure_remove --file="$final_path/live"
-	ynh_setup_source --dest_dir="$final_path/live"
+	if [ "$(lsb_release --codename --short)" = "buster" ]; then
+        ynh_setup_source --dest_dir="$final_path/live"
+    else
+        ynh_script_progression --message="Setting up source files..."
 
-	# Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292
+        ynh_setup_source --dest_dir="$final_path/live" --source_id=jessie
-	ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock"
+    
+        # Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292
+        ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock"
+    fi
 
 	if [ -d "$final_path/system.tmp" ]; then
 		mv --verbose --no-target-directory "$final_path/system.tmp" "$final_path/live/public/system"