aboutsummaryrefslogtreecommitdiff
path: root/scripts/upgrade
diff options
context:
space:
mode:
authoryalh76 <yalh@yahoo.com>2021-03-22 20:54:42 +0100
committerGitHub <noreply@github.com>2021-03-22 20:54:42 +0100
commit0337521cde48b451846f680add7dc0ed18d5545a (patch)
tree72379ec6dcb02d543ed3185081a555acd98326ea /scripts/upgrade
parent1d258ddb722f29159e506c1c4fd8a8bc052afe89 (diff)
parentb01227d32602fe2239f1c74fa8ac06940230c52e (diff)
downloadmastodon_ynh-0337521cde48b451846f680add7dc0ed18d5545a.tar.gz
mastodon_ynh-0337521cde48b451846f680add7dc0ed18d5545a.tar.bz2
mastodon_ynh-0337521cde48b451846f680add7dc0ed18d5545a.zip
Merge pull request #261 from YunoHost-Apps/ynh_ruby__3
Ynh ruby 3
Diffstat (limited to 'scripts/upgrade')
-rw-r--r--scripts/upgrade28
1 files changed, 14 insertions, 14 deletions
diff --git a/scripts/upgrade b/scripts/upgrade
index bbbe50b..aa96bef 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -184,10 +184,10 @@ ynh_add_nginx_config 'port_web port_stream'
#=================================================
ynh_script_progression --message="Upgrading dependencies..."
-ynh_remove_nodejs
-ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
ynh_install_app_dependencies $pkg_dependencies
+ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
+ynh_install_ruby --ruby_version=$RUBY_VERSION
#=================================================
# CREATE DEDICATED USER
@@ -220,10 +220,10 @@ ynh_add_swap --size=$swap_needed
#=================================================
ynh_script_progression --message="Installing Ruby..."
-ynh_install_ruby --ruby_version=$RUBY_VERSION
pushd "$final_path/live"
- gem update --system
- gem install bundler:$BUNDLER_VERSION --no-document
+ ynh_use_ruby
+ ynh_gem update --system
+ ynh_gem install bundler --no-document
popd
#=================================================
@@ -243,15 +243,15 @@ ynh_script_progression --message="Upgrading Mastodon..."
chown -R "$app": "$final_path"
pushd "$final_path/live"
+ sudo -u $app $ynh_ruby_load_path bin/bundle config deployment 'true'
+ sudo -u $app $ynh_ruby_load_path bin/bundle config without 'development test'
+ sudo -u $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
ynh_use_nodejs
- sudo -u $app PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle config deployment 'true'
- sudo -u $app PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle config without 'development test'
- sudo -u $app PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
- sudo -u $app PATH=$PATH yarn install --pure-lockfile
- sudo -u $app RAILS_ENV=production PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle exec rails assets:clean
- sudo -u $app RAILS_ENV=production PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle exec rails assets:precompile
- sudo -u $app RAILS_ENV=production PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle exec rails db:migrate
- sudo -u $app RAILS_ENV=production PATH=$PATH bin/tootctl cache clear
+ sudo -u $app $ynh_node_load_PATH yarn install --pure-lockfile
+ sudo -u $app RAILS_ENV=production $ynh_ruby_load_path bin/bundle exec rails assets:clean
+ sudo -u $app RAILS_ENV=production $ynh_ruby_load_path bin/bundle exec rails assets:precompile
+ sudo -u $app RAILS_ENV=production $ynh_ruby_load_path bin/bundle exec rails db:migrate
+ sudo -u $app RAILS_ENV=production $ynh_ruby_load_path bin/tootctl cache clear
popd
#=================================================
@@ -295,7 +295,7 @@ yunohost service add "$app-streaming" --description "$app streaming service"
#=================================================
ynh_script_progression --message="Starting a systemd service..."
-ynh_systemd_action --service_name=${app}-web --action="start" --log_path=systemd --line_match="Listening on tcp"
+ynh_systemd_action --service_name=${app}-web --action="start" --log_path=systemd --line_match="Listening on"
ynh_systemd_action --service_name=${app}-sidekiq --action="start" --log_path=systemd --line_match="Schedules Loaded"
ynh_systemd_action --service_name=${app}-streaming --action="start" --log_path=systemd --line_match="Worker 1 now listening"