YunoHost-Apps/mastodon_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/mastodon_ynh.git synced 2024-09-03 19:46:02 +02:00
Code Issues Activity Actions

Several fixes

Browse source
This commit is contained in:
yalh76 2021-03-08 00:45:35 +01:00
parent c4c7947521
commit 91ef58fdea
3 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scripts/install
View file

@ -75,9 +75,9 @@ ynh_app_setting_set --app=$app --key=port_stream --value=$port_stream
#================================================= #=================================================
ynh_script_progression --message="Installing dependencies..." ynh_script_progression --message="Installing dependencies..."
ynh_install_app_dependencies $pkg_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_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 ynh_install_ruby --ruby_version=$RUBY_VERSION
#================================================= #=================================================
@ -145,7 +145,7 @@ ynh_script_progression --message="Installing Ruby..."
pushd "$final_path/live" pushd "$final_path/live"
ynh_use_ruby ynh_use_ruby
ynh_gem update --system # ynh_gem update --system
ynh_gem install bundler --no-document ynh_gem install bundler --no-document
popd popd
@ -182,17 +182,17 @@ ynh_script_progression --message="Installing Mastodon..."
chown -R "$app": "$final_path" chown -R "$app": "$final_path"
pushd "$final_path/live" pushd "$final_path/live"
sudo -u $app bin/bundle config deployment 'true' sudo -u $app $ynh_ruby_load_path bin/bundle config deployment 'true'
sudo -u $app bin/bundle config without 'development test' sudo -u $app $ynh_ruby_load_path 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 install -j$(getconf _NPROCESSORS_ONLN)
ynh_use_nodejs ynh_use_nodejs
sudo -u $app $ynh_node_load_PATH yarn install --pure-lockfile sudo -u $app $ynh_node_load_PATH yarn install --pure-lockfile
echo "SAFETY_ASSURED=1">> $config echo "SAFETY_ASSURED=1">> $config
sudo -u $app RAILS_ENV=production bin/bundle exec rails db:setup --quiet sudo -u $app RAILS_ENV=production $ynh_ruby_load_path 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 $ynh_ruby_load_path 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 $ynh_ruby_load_path 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 $ynh_ruby_load_path 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/tootctl accounts modify "$admin" --approve
popd popd
vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "$final_path/live/key.txt") vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "$final_path/live/key.txt")

9
scripts/restore
View file

@ -101,19 +101,20 @@ ynh_add_swap --size=$swap_needed
#================================================= #=================================================
ynh_script_progression --message="Reinstalling dependencies..." ynh_script_progression --message="Reinstalling dependencies..."
ynh_install_app_dependencies $pkg_dependencies
ynh_install_nodejs --nodejs_version=$NODEJS_VERSION 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_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 # INSTALLING RUBY AND BUNDLER
#================================================= #=================================================
ynh_script_progression --message="Installing Ruby..." ynh_script_progression --message="Installing Ruby..."
ynh_install_ruby --ruby_version=$RUBY_VERSION
pushd "$final_path/live" pushd "$final_path/live"
gem update --system ynh_use_ruby
gem install bundler --no-document # ynh_gem update --system
ynh_gem install bundler --no-document
popd popd
#================================================= #=================================================

18
scripts/upgrade
View file

@ -185,8 +185,8 @@ ynh_add_nginx_config 'port_web port_stream'
ynh_script_progression --message="Upgrading dependencies..." ynh_script_progression --message="Upgrading dependencies..."
ynh_install_app_dependencies $pkg_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_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 ynh_install_ruby --ruby_version=$RUBY_VERSION
#================================================= #=================================================
@ -222,7 +222,7 @@ ynh_script_progression --message="Installing Ruby..."
pushd "$final_path/live" pushd "$final_path/live"
ynh_use_ruby ynh_use_ruby
ynh_gem update --system # ynh_gem update --system
ynh_gem install bundler --no-document ynh_gem install bundler --no-document
popd popd
@ -243,15 +243,15 @@ ynh_script_progression --message="Upgrading Mastodon..."
chown -R "$app": "$final_path" chown -R "$app": "$final_path"
pushd "$final_path/live" pushd "$final_path/live"
sudo -u $app bin/bundle config deployment 'true' sudo -u $app $ynh_ruby_load_path bin/bundle config deployment 'true'
sudo -u $app bin/bundle config without 'development test' sudo -u $app $ynh_ruby_load_path 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 install -j$(getconf _NPROCESSORS_ONLN)
ynh_use_nodejs ynh_use_nodejs
sudo -u $app $ynh_node_load_PATH yarn install --pure-lockfile 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 $ynh_ruby_load_path bin/bundle exec rails assets:clean
sudo -u $app RAILS_ENV=production bin/bundle exec rails assets:precompile sudo -u $app RAILS_ENV=production $ynh_ruby_load_path bin/bundle exec rails assets:precompile
sudo -u $app RAILS_ENV=production bin/bundle exec rails db:migrate sudo -u $app RAILS_ENV=production $ynh_ruby_load_path 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/tootctl cache clear
popd popd
#================================================= #=================================================