diff --git a/check_process b/check_process deleted file mode 100644 index cac92289..00000000 --- a/check_process +++ /dev/null @@ -1,45 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - is_public=1 - ; Checks - pkg_linter=1 - setup_sub_dir=0 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - # 0.10.6 - # upgrade=1 from_commit=605a47aac7553fdcc6012531ee67add8dbe37b97 - # 0.10.7 - # upgrade=1 from_commit=7fa86c3e6e6db6668be0a165213d554850b9fce8 - # 0.10.8 - # upgrade=1 from_commit=10c3703567d1e9504ea4f298778464c7dd561470 - # 0.10.9~ynh1 - # upgrade=1 from_commit=8c5e710060da43a946336d66a30b9c311cfdbc37 - # 0.10.9~ynh2 - # upgrade=1 from_commit=c81ed6b760a1a68b8993917e808434166766a37a - # 0.10.9~ynh3 - # upgrade=1 from_commit=9c7d0ff114bb0bd3482901fde4bd82b494aa2e6d - # 0.10.10~ynh1 - # upgrade=1 from_commit=1aa406fb124b92f03b1bb69fc3462936d5227278 - # 0.10.10~ynh3 - # upgrade=1 from_commit=2a796e30dd521a5022586bc7fe59d189210028a4 - # 0.10.10~ynh4 - # upgrade=1 from_commit=8ef41895fbd38008f3718e164d0bf3f0d97a2c03 - # 0.11.0~ynh1 - # upgrade=1 from_commit=c7181d1c7cb6cba53bb65e622c78b0309a53b76a - # 0.11.0~ynh2 - # upgrade=1 from_commit=d85b0b112afd19313dbf4cfba954e255789dfb88 - # 0.11.1~ynh2 - upgrade=1 from_commit=f8ecb9a95fe6430fb9d93ca674e4f0d475ecd332 - # 0.11.2~ynh1 - upgrade=1 from_commit=7a4833633f76d050296c783e565f8cdfc913c75a - backup_restore=1 - multi_instance=1 - port_already_use=0 - change_url=1 -;;; Options -Email=yalh@yahoo.com -Notification=all diff --git a/manifest.toml b/manifest.toml index dd8c751a..ed67388e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -40,7 +40,6 @@ ram.runtime = "50M" url = "https://github.com/pixelfed/pixelfed/archive/21714eec342d079c169210c49099b2988bbb205b.tar.gz" sha256 = "eff6d2e4d93af1ef05d01fab2c55ebe6f55bf82866edcdc9af3a72767976a52d" - [resources.system_user] [resources.install_dir] diff --git a/scripts/upgrade b/scripts/upgrade index b3a38f09..4254c110 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -29,13 +29,22 @@ ynh_supervisor_action --service_name="${app}-horizon" --action="stop" --log_path #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -ynh_app_setting_delete --app=$app --key=fpm_footprint -ynh_app_setting_delete --app=$app --key=fpm_usage +# If fpm_footprint doesn't exist, create it +if [ -z "${fpm_footprint:-}" ]; then + fpm_footprint=low + ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint +fi -# If redis_db doesn't exist, create it -if [ -z "$redis_db" ]; then - redis_db=$(ynh_redis_get_free_db) - ynh_app_setting_set --app=$app --key=redis_db --value=$redis_db +# If fpm_free_footprint doesn't exist, create it +if [ -z "${fpm_free_footprint:-}" ]; then + fpm_free_footprint=0 + ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint +fi + +# If fpm_usage doesn't exist, create it +if [ -z "${fpm_usage:-}" ]; then + fpm_usage=low + ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi # If app_key doesn't exist, retrieve it @@ -107,7 +116,7 @@ chmod 600 "$install_dir"/.env ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config +ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint #================================================= # NGINX CONFIGURATION diff --git a/tests.toml b/tests.toml index f5c7d220..3e9755f2 100644 --- a/tests.toml +++ b/tests.toml @@ -3,5 +3,7 @@ test_format = 1.0 [default] # ------------------------------- - # Default args to use for install - # ------------------------------- \ No newline at end of file + # Commits to test upgrade from + # ------------------------------- + + test_upgrade_from.7a4833633f76d050296c783e565f8cdfc913c75a.name = "Upgrade from 0.11.2"