diff options
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | manifest.json | 2 | ||||
| -rw-r--r-- | scripts/install | 9 | ||||
| -rw-r--r-- | scripts/upgrade | 15 |
4 files changed, 17 insertions, 13 deletions
@@ -1,10 +1,10 @@ # Mastodon for YunoHost -[](https://github.com/YunoHost-Apps/mastodon_ynh/releases) +[](https://github.com/YunoHost-Apps/mastodon_ynh/releases) [](https://github.com/YunoHost-Apps/mastodon_ynh/milestones) [](https://github.com/YunoHost-Apps/mastodon_ynh#dependencies) [](https://raw.githubusercontent.com/YunoHost-Apps/mastodon_ynh/master/LICENSE) -[](https://github.com/YunoHost/yunohost) +[](https://github.com/YunoHost/yunohost) [](https://github.com/YunoHost-Apps/mastodon_ynh/issues) [](https://install-app.yunohost.org/?app=mastodon) diff --git a/manifest.json b/manifest.json index 09da9c0..228fa4b 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.0.0", + "version": "2.2.0", "url": "https://github.com/tootsuite/mastodon", "license": "AGPL v3.0", "maintainer": { diff --git a/scripts/install b/scripts/install index f3ac754..3d5172f 100644 --- a/scripts/install +++ b/scripts/install @@ -122,17 +122,18 @@ COMMANDS # Install ruby-build sudo su - $app <<RCOMMANDS -/opt/mastodon/.rbenv/bin/rbenv install 2.4.2 -/opt/mastodon/.rbenv/versions/2.4.2/bin/ruby -v +/opt/mastodon/.rbenv/bin/rbenv install 2.5.0 +/opt/mastodon/.rbenv/versions/2.5.0/bin/ruby -v RCOMMANDS # Create symlink for ruby -sudo ln -s /opt/mastodon/.rbenv/versions/2.4.2/bin/ruby /usr/bin/ruby || true +sudo rm /usr/bin/ruby || true +sudo ln -s /opt/mastodon/.rbenv/versions/2.5.0/bin/ruby /usr/bin/ruby || true # Install Mastodon sudo su - $app <<MCOMMANDS pushd ~/live -/opt/mastodon/.rbenv/versions/2.4.2/bin/gem install bundler +/opt/mastodon/.rbenv/versions/2.5.0/bin/gem install bundler bin/bundle install --deployment --without development test yarn install --production MCOMMANDS diff --git a/scripts/upgrade b/scripts/upgrade index 0c469bb..8e33ce8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -67,21 +67,22 @@ fi # add additional package for upgrade ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev postgresql-server-dev-9.4 -# Install ruby 2.4.2 for release 2.0 +# Install ruby 2.5.0 for release 2.0 sudo su - $app <<RCOMMANDS cd $final_path/.rbenv && git pull && cd - cd $final_path/.rbenv/plugins/ruby-build && git pull && cd - -$final_path/.rbenv/bin/rbenv install 2.4.2 || true -$final_path/.rbenv/versions/2.4.2/bin/ruby -v +$final_path/.rbenv/bin/rbenv install 2.5.0 || true +$final_path/.rbenv/versions/2.5.0/bin/ruby -v RCOMMANDS -# Create symlink for ruby 2.4.2 -sudo ln -s $final_path/.rbenv/versions/2.4.2/bin/ruby /usr/bin/ruby || true +# Create symlink for ruby 2.5.0 +sudo rm /usr/bin/ruby || true +sudo ln -s $final_path/.rbenv/versions/2.5.0/bin/ruby /usr/bin/ruby || true # Install Mastodon sudo su - $app <<MCOMMANDS pushd ~/live -$final_path/.rbenv/versions/2.4.2/bin/gem install bundler +$final_path/.rbenv/versions/2.5.0/bin/gem install bundler bin/bundle install --deployment --without development test yarn install --pure-lockfile MCOMMANDS @@ -92,6 +93,8 @@ pushd ~/live RAILS_ENV=production bundle exec rails assets:clean RAILS_ENV=production bundle exec rails assets:precompile RAILS_ENV=production bundle exec rails db:migrate +# Upgrade to 2.2.0 +RAILS_ENV=production bundle exec rails mastodon:maintenance:remove_regeneration_markers COMMANDS # Restart Mastodon |