aboutsummaryrefslogtreecommitdiff
path: root/scripts/install
diff options
context:
space:
mode:
authoryalh76 <yalh@yahoo.com>2021-03-08 00:45:35 +0100
committeryalh76 <yalh@yahoo.com>2021-03-08 00:45:35 +0100
commit91ef58fdea28d22e16999e72d2990281fb52b3c2 (patch)
tree1f6e0c0d53f92febec8a3a638b92479ff182058d /scripts/install
parentc4c79475213f752a42d427a9be4be25b5dcca02e (diff)
downloadmastodon_ynh-91ef58fdea28d22e16999e72d2990281fb52b3c2.tar.gz
mastodon_ynh-91ef58fdea28d22e16999e72d2990281fb52b3c2.tar.bz2
mastodon_ynh-91ef58fdea28d22e16999e72d2990281fb52b3c2.zip
Several fixes
Diffstat (limited to 'scripts/install')
-rw-r--r--scripts/install22
1 files changed, 11 insertions, 11 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")