aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authoreric_G <46165813+ericgaspar@users.noreply.github.com>2024-01-13 16:41:06 +0100
committerGitHub <noreply@github.com>2024-01-13 16:41:06 +0100
commite942dc8ca3092dde95bb09fe4b1fa2b0f68cfa13 (patch)
tree55bbd8bc5ca92cda61f8b1365afd78a1b92c0662 /scripts
parent9622cf0c39889cd32ed820f2c91ed5ab323a211b (diff)
parente3d0328771596de59563dcd7794948b2c2249096 (diff)
downloadmastodon_ynh-e942dc8ca3092dde95bb09fe4b1fa2b0f68cfa13.tar.gz
mastodon_ynh-e942dc8ca3092dde95bb09fe4b1fa2b0f68cfa13.tar.bz2
mastodon_ynh-e942dc8ca3092dde95bb09fe4b1fa2b0f68cfa13.zip
Merge pull request #428 from YunoHost-Apps/testing
Testing
Diffstat (limited to 'scripts')
-rw-r--r--scripts/install2
-rw-r--r--scripts/upgrade6
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/install b/scripts/install
index 1ac067f..d5976f7 100644
--- a/scripts/install
+++ b/scripts/install
@@ -194,7 +194,7 @@ pushd "$final_path/live"
ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:setup --quiet
ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:precompile --quiet
ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt
- ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=Admin > /dev/null
+ ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=Owner > /dev/null
ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts modify "$admin" --approve
popd
diff --git a/scripts/upgrade b/scripts/upgrade
index e770e63..e041939 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -66,9 +66,9 @@ ynh_abort_if_errors
#=================================================
ynh_script_progression --message="Stopping a systemd service..." --weight=1
-ynh_systemd_action --service_name=${app}-web --action="stop" --log_path=systemd --line_match="Stopped"
-ynh_systemd_action --service_name=${app}-sidekiq --action="stop" --log_path=systemd --line_match="Stopped"
-ynh_systemd_action --service_name=${app}-streaming --action="stop" --log_path=systemd --line_match="Stopped"
+ynh_systemd_action --service_name=${app}-web --action="stop" --log_path=systemd
+ynh_systemd_action --service_name=${app}-sidekiq --action="stop" --log_path=systemd
+ynh_systemd_action --service_name=${app}-streaming --action="stop" --log_path=systemd
#=================================================
# ENSURE DOWNWARD COMPATIBILITY