aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--conf/app-mastodon.src4
-rw-r--r--manifest.json2
-rw-r--r--scripts/upgrade12
4 files changed, 10 insertions, 10 deletions
diff --git a/README.md b/README.md
index 488481d..bcfa53c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Mastodon for YunoHost
-[![Latest Version](https://img.shields.io/badge/version-2.4.1-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases)
+[![Latest Version](https://img.shields.io/badge/version-2.4.2-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases)
[![Status](https://img.shields.io/badge/status-testing-yellow.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/milestones)
[![Dependencies](https://img.shields.io/badge/dependencies-includes-lightgrey.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh#dependencies)
[![GitHub license](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat)](https://raw.githubusercontent.com/YunoHost-Apps/mastodon_ynh/master/LICENSE)
diff --git a/conf/app-mastodon.src b/conf/app-mastodon.src
index 61c7260..fa0e2eb 100644
--- a/conf/app-mastodon.src
+++ b/conf/app-mastodon.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.4.1.tar.gz
-SOURCE_SUM=d90b573e16359f63f7b2834f1078ecfdd7d78cd5a26acd8293a314dd2b6ff1ec
+SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.4.2.tar.gz
+SOURCE_SUM=2de73e57e4f3da4b046b8b1d8c90a03d1bdd8f9abddca8f5329d02a34ed821a5
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 11c277b..ddb2479 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,7 +9,7 @@
"en": "Mastodon is a free, open-source social network.",
"fr": "Mastodon est un réseau social gratuit et open source."
},
- "version": "2.4.1",
+ "version": "2.4.2",
"url": "https://github.com/tootsuite/mastodon",
"license": "AGPL-3.0-or-later",
"maintainer": {
diff --git a/scripts/upgrade b/scripts/upgrade
index 8551421..c6b7a83 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -82,7 +82,6 @@ fi
# Add yarn repo
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-
#=================================================
# INSTALL DEPENDENCIES
#=================================================
@@ -103,18 +102,21 @@ ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libi
# STANDARD UPGRADE STEPS
#=================================================
+# Change owner of live folder
+chown -R $app: $final_path/live
+
# Stop Mastodon Services
# Restart Mastodon
yunohost service stop "$app-web"
yunohost service stop "$app-sidekiq"
yunohost service stop "$app-streaming"
-# Change owner of live folder
-chown -R $app: $final_path/live
-
# Download Mastodon
ynh_setup_source "$final_path/live" "app-mastodon"
+# Clean un-need Files
+ynh_secure_remove $final_path/live/config/initializers/timeout.rb
+
#=================================================
# NGINX CONFIGURATION
#=================================================
@@ -171,8 +173,6 @@ popd
sudo su - $app <<COMMANDS
pushd ~/live
RAILS_ENV=production $final_path/.rbenv/versions/2.5.1/bin/bundle exec rails db:migrate
-# Upgrade to 2.2.0
-RAILS_ENV=production $final_path/.rbenv/versions/2.5.1/bin/bundle exec rails mastodon:maintenance:remove_regeneration_markers
COMMANDS
)
#=================================================