From 5ce2a24649e12a087ce2a424d418262b1425ffb5 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 6 Mar 2021 01:10:38 +0100 Subject: ynh_ruby_3 --- scripts/install | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'scripts/install') diff --git a/scripts/install b/scripts/install index 7d21d45..204bb52 100644 --- a/scripts/install +++ b/scripts/install @@ -75,9 +75,10 @@ ynh_app_setting_set --app=$app --key=port_stream --value=$port_stream #================================================= ynh_script_progression --message="Installing 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_nodejs --nodejs_version=$NODEJS_VERSION +ynh_install_ruby --ruby_version=$RUBY_VERSION #================================================= # CREATE A POSTGRESQL DATABASE @@ -142,10 +143,10 @@ ynh_add_swap --size=$swap_needed #================================================= ynh_script_progression --message="Installing Ruby..." -ynh_install_ruby --ruby_version=$RUBY_VERSION pushd "$final_path/live" - $RBENV_ROOT/versions/$app/bin/gem update --system - $RBENV_ROOT/versions/$app/bin/gem install bundler:$BUNDLER_VERSION --no-document + ynh_use_ruby + $ynh_gem update --system + $ynh_gem install bundler:$BUNDLER_VERSION --no-document popd #================================================= @@ -181,17 +182,17 @@ ynh_script_progression --message="Installing Mastodon..." chown -R "$app": "$final_path" pushd "$final_path/live" + sudo -u $app $ynh_ruby_load_path $ruby_path/bundle config deployment 'true' + sudo -u $app $ynh_ruby_load_path $ruby_path/bundle config without 'development test' + sudo -u $app $ynh_ruby_load_path $ruby_path/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 $ynh_node_load_PATH yarn install --pure-lockfile echo "SAFETY_ASSURED=1">> $config - sudo -u $app RAILS_ENV=production PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle exec rails db:setup --quiet - sudo -u $app RAILS_ENV=production PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle exec rails assets:precompile --quiet - sudo -u $app RAILS_ENV=production PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt - sudo -u $app RAILS_ENV=production PATH=$PATH bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=admin > /dev/null - sudo -u $app RAILS_ENV=production PATH=$PATH bin/tootctl accounts modify "$admin" --approve + sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails db:setup --quiet + sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails assets:precompile --quiet + sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt + sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=admin > /dev/null + sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/tootctl accounts modify "$admin" --approve popd vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "$final_path/live/key.txt") -- cgit v1.2.3-70-g09d2 From 8e84376b47555be3c88b1475f54f0fa232d115b8 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 6 Mar 2021 01:52:44 +0100 Subject: Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/install') diff --git a/scripts/install b/scripts/install index 204bb52..208b0d2 100644 --- a/scripts/install +++ b/scripts/install @@ -125,7 +125,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path #================================================= # ADD SWAP IF NEEDED #================================================= -ynh_script_progression --message="Adding swap is needed..." +ynh_script_progression --message="Adding swap if needed..." total_memory=$(ynh_get_ram --total) swap_needed=0 -- cgit v1.2.3-70-g09d2 From 560506c3e74bc7a2f7923b537d27c2b66079ce47 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 6 Mar 2021 02:15:48 +0100 Subject: fix bin/tootctl --- conf/cron | 10 +++++----- scripts/install | 4 ++-- scripts/upgrade | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'scripts/install') diff --git a/conf/cron b/conf/cron index a15c428..776808b 100644 --- a/conf/cron +++ b/conf/cron @@ -1,5 +1,5 @@ -@daily cd __FINAL_PATH__/live && RAILS_ENV=production __RUBY_PATH__/tootctl media remove -@monthly cd __FINAL_PATH__/live && RAILS_ENV=production __RUBY_PATH__/tootctl media remove-orphans -@monthly cd __FINAL_PATH__/live && RAILS_ENV=production __RUBY_PATH__/tootctl accounts cull -@monthly cd __FINAL_PATH__/live && RAILS_ENV=production __RUBY_PATH__/tootctl statuses remove -@monthly cd __FINAL_PATH__/live && RAILS_ENV=production __RUBY_PATH__/tootctl preview_cards remove +@daily cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl media remove +@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl media remove-orphans +@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl accounts cull +@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl statuses remove +@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl preview_cards remove diff --git a/scripts/install b/scripts/install index 208b0d2..977f0b6 100644 --- a/scripts/install +++ b/scripts/install @@ -191,8 +191,8 @@ pushd "$final_path/live" sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails db:setup --quiet sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails assets:precompile --quiet sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt - sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=admin > /dev/null - sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/tootctl accounts modify "$admin" --approve + 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/upgrade b/scripts/upgrade index 27aaff0..2e8753b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -251,7 +251,7 @@ pushd "$final_path/live" sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails assets:clean sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails assets:precompile sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails db:migrate - sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/tootctl cache clear + sudo -u $app RAILS_ENV=production $ynh_ruby_load_path bin/tootctl cache clear popd #================================================= -- cgit v1.2.3-70-g09d2 From c4c79475213f752a42d427a9be4be25b5dcca02e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 7 Mar 2021 20:17:05 +0100 Subject: simplification --- scripts/_common.sh | 2 +- scripts/install | 22 +++++++++++----------- scripts/restore | 4 ++-- scripts/upgrade | 20 ++++++++++---------- 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'scripts/install') diff --git a/scripts/_common.sh b/scripts/_common.sh index 1c28aec..b6f4796 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -10,7 +10,7 @@ pkg_dependencies="imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git MEMORY_NEEDED="2560" RUBY_VERSION="2.7.2" -BUNDLER_VERSION="1.17.3" + NODEJS_VERSION="12" #================================================= diff --git a/scripts/install b/scripts/install index 977f0b6..a390c66 100644 --- a/scripts/install +++ b/scripts/install @@ -145,8 +145,8 @@ ynh_script_progression --message="Installing Ruby..." pushd "$final_path/live" ynh_use_ruby - $ynh_gem update --system - $ynh_gem install bundler:$BUNDLER_VERSION --no-document + 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 $ynh_ruby_load_path $ruby_path/bundle config deployment 'true' - sudo -u $app $ynh_ruby_load_path $ruby_path/bundle config without 'development test' - sudo -u $app $ynh_ruby_load_path $ruby_path/bundle install -j$(getconf _NPROCESSORS_ONLN) + 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) 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 $ynh_ruby_load_path $ruby_path/bundle exec rails db:setup --quiet - sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails assets:precompile --quiet - sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/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 + 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 popd vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "$final_path/live/key.txt") @@ -254,7 +254,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" diff --git a/scripts/restore b/scripts/restore index 6744ddb..19a7715 100644 --- a/scripts/restore +++ b/scripts/restore @@ -113,7 +113,7 @@ 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 + gem install bundler --no-document popd #================================================= @@ -150,7 +150,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" diff --git a/scripts/upgrade b/scripts/upgrade index 2e8753b..3f81e57 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -222,8 +222,8 @@ ynh_script_progression --message="Installing Ruby..." pushd "$final_path/live" ynh_use_ruby - $ynh_gem update --system - $ynh_gem install bundler:$BUNDLER_VERSION --no-document + 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 $ruby_path/bundle config deployment 'true' - sudo -u $app $ynh_ruby_load_path $ruby_path/bundle config without 'development test' - sudo -u $app $ynh_ruby_load_path $ruby_path/bundle install -j$(getconf _NPROCESSORS_ONLN) + 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) ynh_use_nodejs sudo -u $app $ynh_node_load_PATH yarn install --pure-lockfile - sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails assets:clean - sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails assets:precompile - sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails db:migrate - sudo -u $app RAILS_ENV=production $ynh_ruby_load_path bin/tootctl cache clear + 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 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" -- cgit v1.2.3-70-g09d2 From 91ef58fdea28d22e16999e72d2990281fb52b3c2 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 8 Mar 2021 00:45:35 +0100 Subject: Several fixes --- scripts/install | 22 +++++++++++----------- scripts/restore | 9 +++++---- scripts/upgrade | 18 +++++++++--------- 3 files changed, 25 insertions(+), 24 deletions(-) (limited to 'scripts/install') 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 #================================================= -- cgit v1.2.3-70-g09d2 From e4332ad1371693519afce985a7ac8a3b1853022b Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 8 Mar 2021 00:57:36 +0100 Subject: ynh_gem update --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/install') diff --git a/scripts/install b/scripts/install index a3bc479..a37bbba 100644 --- a/scripts/install +++ b/scripts/install @@ -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 diff --git a/scripts/restore b/scripts/restore index 64ac8f8..a8cfd30 100644 --- a/scripts/restore +++ b/scripts/restore @@ -113,7 +113,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 diff --git a/scripts/upgrade b/scripts/upgrade index 7a095ad..aa96bef 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -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 -- cgit v1.2.3-70-g09d2 From b07683cc0130e0b5038371472aef015162759961 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 24 Mar 2021 19:58:27 +0100 Subject: Fix manually modified file --- scripts/install | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scripts/install') diff --git a/scripts/install b/scripts/install index a37bbba..0b79b96 100644 --- a/scripts/install +++ b/scripts/install @@ -201,6 +201,8 @@ ynh_app_setting_set --app="$app" --key=vapid_private_key --value="$vapid_private vapid_public_key=$(grep -oP "VAPID_PUBLIC_KEY=\K.+" "$final_path/live/key.txt") ynh_app_setting_set --app="$app" --key=vapid_public_key --value="$vapid_public_key" +ynh_delete_file_checksum --file="$config" + ynh_add_config --template="../conf/.env.production.sample" --destination="$config" ynh_secure_remove --file="$final_path/live/key.txt" -- cgit v1.2.3-70-g09d2