laria/mastodon_ynh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'testing' into ruby-and-nodejs-resources

Browse source
This commit is contained in:
eric_G 2025-09-01 10:16:50 +02:00 committed by GitHub
commit d9d151b9bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
manifest.toml
View file

@ -25,7 +25,6 @@ architectures = "all"
multi_instance = true
ldap = true
sso = false
disk = "2G"

14
scripts/remove
View file

@ -7,26 +7,18 @@ source /usr/share/yunohost/helpers
#=================================================
# REMOVE SYSTEM CONFIGURATIONS
#=================================================
# REMOVE SYSTEMD SERVICE
#=================================================
ynh_script_progression "Removing system configurations related to $app..."
# Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
if ynh_hide_warnings yunohost service status "$app-web" >/dev/null
then
ynh_script_progression "Removing $app-web service integration..."
if ynh_hide_warnings yunohost service status "$app-web" >/dev/null; then
yunohost service remove "$app-web"
fi
if ynh_hide_warnings yunohost service status "$app-sidekiq" >/dev/null
then
ynh_script_progression "Removing $app-sidekiq service integration..."
if ynh_hide_warnings yunohost service status "$app-sidekiq" >/dev/null; then
yunohost service remove "$app-sidekiq"
fi
if ynh_hide_warnings yunohost service status "$app-streaming" >/dev/null
then
ynh_script_progression "Removing $app-streaming service integration..."
if ynh_hide_warnings yunohost service status "$app-streaming" >/dev/null; then
yunohost service remove "$app-streaming"
fi

4
scripts/restore
View file

@ -5,8 +5,6 @@ source ../settings/scripts/_common.sh
source ../settings/scripts/ynh_add_swap
source /usr/share/yunohost/helpers
#=================================================
# STANDARD RESTORATION STEPS
#=================================================
# RESTORE THE APP MAIN DIR
#=================================================
@ -53,8 +51,6 @@ popd
#=================================================
# RESTORE SYSTEM CONFIGURATIONS
#=================================================
# RESTORE THE PHP-FPM CONFIGURATION
#=================================================
ynh_script_progression "Restoring system configurations related to $app..."
ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf"

13
scripts/upgrade
View file

@ -16,11 +16,11 @@ fi
#=================================================
# STOP SYSTEMD SERVICE
#=================================================
ynh_script_progression "Stopping $app's systemd service..."
ynh_systemctl --service=${app}-web --action="stop" --log_path=/var/log/$app/$app-web.log --wait_until="Goodbye"
ynh_systemctl --service=${app}-sidekiq --action="stop" --log_path=/var/log/$app/$app-sidekiq.log --wait_until="Bye"
ynh_systemctl --service=${app}-streaming --action="stop" --log_path=/var/log/$app/$app-streaming.log
ynh_systemctl --service=${app}-web --action="stop" --log_path=/var/log/$app/$app-web.log --wait_until="Goodbye"
ynh_systemctl --service=${app}-sidekiq --action="stop" --log_path=/var/log/$app/$app-sidekiq.log --wait_until="Bye"
ynh_systemctl --service=${app}-streaming --action="stop" --log_path=/var/log/$app/$app-streaming.log
#=================================================
# ENSURE DOWNWARD COMPATIBILITY
@ -46,12 +46,9 @@ fi
ynh_script_progression "Adding $swap_needed Mo to swap..."
ynh_add_swap --size=$swap_needed
#=================================================
# "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...)
#=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE
#=================================================
ynh_script_progression "Upgrading source files..."
# Download, check integrity, uncompress and patch the source from manifest.toml
@ -106,8 +103,6 @@ ynh_config_add --template="cron" --destination="/etc/cron.d/$app"
mkdir -p /var/log/$app
ynh_config_add_logrotate
#=================================================
# RECONFIGURE THE APP (UPDATE CONF, APPLY MIGRATIONS...)
#=================================================
# UPDATE A CONFIG FILE
#=================================================

2
tests.toml
View file

@ -21,5 +21,5 @@ test_format = 1.0
# Commits to test upgrade from
# -------------------------------
test_upgrade_from.8102fffa52a4e3279bba9fbdafb3a0e5b1fe3e17.name = "4.2.13~ynh1"
#test_upgrade_from.8102fffa52a4e3279bba9fbdafb3a0e5b1fe3e17.name = "4.2.13~ynh1"
test_upgrade_from.38e8436dd8489140af8921c81d9d891bfa92349e.name = "4.3.9 - Helpers v1"