From 91ef58fdea28d22e16999e72d2990281fb52b3c2 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 8 Mar 2021 00:45:35 +0100 Subject: [PATCH] Several fixes --- scripts/install | 22 +++++++++++----------- scripts/restore | 9 +++++---- scripts/upgrade | 18 +++++++++--------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/scripts/install b/scripts/install index a390c66..a3bc479 100644 --- a/scripts/install +++ b/scripts/install @@ -75,9 +75,9 @@ ynh_app_setting_set --app=$app --key=port_stream --value=$port_stream #================================================= ynh_script_progression --message="Installing dependencies..." -ynh_install_app_dependencies $pkg_dependencies -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_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 #================================================= @@ -145,7 +145,7 @@ ynh_script_progression --message="Installing Ruby..." pushd "$final_path/live" ynh_use_ruby - ynh_gem update --system + # ynh_gem update --system ynh_gem install bundler --no-document popd @@ -182,17 +182,17 @@ ynh_script_progression --message="Installing Mastodon..." chown -R "$app": "$final_path" pushd "$final_path/live" - sudo -u $app bin/bundle config deployment 'true' - sudo -u $app bin/bundle config without 'development test' - sudo -u $app bin/bundle install -j$(getconf _NPROCESSORS_ONLN) + 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 $ynh_node_load_PATH yarn install --pure-lockfile echo "SAFETY_ASSURED=1">> $config - sudo -u $app RAILS_ENV=production bin/bundle exec rails db:setup --quiet - sudo -u $app RAILS_ENV=production bin/bundle exec rails assets:precompile --quiet - sudo -u $app RAILS_ENV=production bin/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt - sudo -u $app RAILS_ENV=production bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=admin > /dev/null - sudo -u $app RAILS_ENV=production bin/tootctl accounts modify "$admin" --approve + sudo -u $app RAILS_ENV=production $ynh_ruby_load_path bin/bundle exec rails db:setup --quiet + sudo -u $app RAILS_ENV=production $ynh_ruby_load_path bin/bundle exec rails assets:precompile --quiet + sudo -u $app RAILS_ENV=production $ynh_ruby_load_path bin/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt + sudo -u $app RAILS_ENV=production $ynh_ruby_load_path bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=admin > /dev/null + sudo -u $app RAILS_ENV=production $ynh_ruby_load_path bin/tootctl accounts modify "$admin" --approve popd vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "$final_path/live/key.txt") diff --git a/scripts/restore b/scripts/restore index 19a7715..64ac8f8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -101,19 +101,20 @@ ynh_add_swap --size=$swap_needed #================================================= ynh_script_progression --message="Reinstalling dependencies..." +ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs --nodejs_version=$NODEJS_VERSION -ynh_install_app_dependencies $pkg_dependencies 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 #================================================= # INSTALLING RUBY AND BUNDLER #================================================= ynh_script_progression --message="Installing Ruby..." -ynh_install_ruby --ruby_version=$RUBY_VERSION pushd "$final_path/live" - gem update --system - gem install bundler --no-document + ynh_use_ruby + # ynh_gem update --system + ynh_gem install bundler --no-document popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 3f81e57..7a095ad 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -185,8 +185,8 @@ ynh_add_nginx_config 'port_web port_stream' ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies -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_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 #================================================= @@ -222,7 +222,7 @@ ynh_script_progression --message="Installing Ruby..." pushd "$final_path/live" ynh_use_ruby - ynh_gem update --system + # 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 bin/bundle config deployment 'true' - sudo -u $app bin/bundle config without 'development test' - sudo -u $app bin/bundle install -j$(getconf _NPROCESSORS_ONLN) + 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 $ynh_node_load_PATH yarn install --pure-lockfile - sudo -u $app RAILS_ENV=production bin/bundle exec rails assets:clean - sudo -u $app RAILS_ENV=production bin/bundle exec rails assets:precompile - sudo -u $app RAILS_ENV=production bin/bundle exec rails db:migrate - sudo -u $app RAILS_ENV=production bin/tootctl cache clear + 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 #=================================================