From ad6b5884e0a5e15d92bba429cbc93ccc5beb34ff Mon Sep 17 00:00:00 2001 From: bg-wa Date: Mon, 11 Sep 2023 09:18:34 -0700 Subject: [PATCH] Upgrade to composer 2 (#241) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Testing : fix php/pictures permissions (#239) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README * Update extra_php-fpm.conf Fix #223 * Testing : fix ≥0.11.5 installs (#222) (#225) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Bump version * Auto-update README * Fix post-v2 issues * Patch post v0.11.5 permissions Why are they not correct by default ? * Testing : fix images rights in package v2 (#224) (#227) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README * Update extra_php-fpm.conf Fix #223 * Testing : fix ≥0.11.5 installs (#222) (#225) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README --------- * Bump version * Auto-update README * Fix post-v2 issues --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Bump version * Auto-update README * Fix mail sendmail (#230) * Testing : patch install permissions (#226) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README * Update extra_php-fpm.conf Fix #223 * Testing : fix ≥0.11.5 installs (#222) (#225) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Bump version * Auto-update README * Fix post-v2 issues * Patch post v0.11.5 permissions Why are they not correct by default ? * Testing : fix images rights in package v2 (#224) (#227) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README * Update extra_php-fpm.conf Fix #223 * Testing : fix ≥0.11.5 installs (#222) (#225) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README --------- * Bump version * Auto-update README * Fix post-v2 issues --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Bump version * Auto-update README --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Update .env use sendmail for default mail sending, should work out of the box for fresh installs * patch source prevent privilege escalation * patching source prevent privilege escalation * patching source prevent privilege escalation * Update manifest.toml Enable authentication on the mail stack for the system user * Update .env authentication on the mail stack with app system user * Fix old email configs --------- Co-authored-by: lapineige Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * remove full_domain * Add manual email verification doc (#233) * Add manual email verification doc * email verification doc (fr) * fix doc * 0.11.9 (#236) * v0.11.9 * Auto-update README --------- Co-authored-by: yunohost-bot * Update manifest.toml * Auto-update README * Fix php conf & image permissions (#238) * Transfer to normal php conf * Transfer to normal php conf * Add running directory * Rename php_fpm.conf to php-fpm.conf * bump version * Auto-update README * bump minimum YNH version * switch back to extra_php * Set proper group owner for php Using new helper https://github.com/YunoHost/yunohost/commit/65d25710725b06d281630644b80d8d01dfba1bde * Set proper group owner for php * manifest: fix yunohost version requirement typo --------- Co-authored-by: yunohost-bot Co-authored-by: Alexandre Aubin --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar Co-authored-by: themancalledjakob Co-authored-by: Alexandre Aubin * Upgrade to composer 2 --------- Co-authored-by: lapineige Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar Co-authored-by: themancalledjakob Co-authored-by: Alexandre Aubin --- scripts/upgrade | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 891ab379..76ef052e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -56,17 +56,17 @@ fi if dpkg --compare-versions "0.9.0~ynh3" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then ynh_script_progression --message="Ensuring upgrade compatibility to 0.9.0~ynh3..." - + ynh_script_progression --message="Configuring a systemd service..." ynh_add_systemd_config --service="${app}-horizon" --template=horizon.conf fi if dpkg --compare-versions "0.10.9~ynh2" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then ynh_script_progression --message="Ensuring upgrade compatibility to 0.10.9~ynh2..." - + ynh_script_progression --message="Stopping and removing the systemd service..." ynh_remove_systemd_config --service="${app}-horizon" - + ynh_script_progression --message="Creating log file..." mkdir -p "/var/log/$app/" touch "/var/log/$app/${app}-horizon.log" @@ -74,20 +74,20 @@ if dpkg --compare-versions "0.10.9~ynh2" gt "$(ynh_read_manifest --manifest="/et ynh_script_progression --message="Configuring a supervisor service..." ynh_add_supervisor_config --service="${app}-horizon" --template=horizon.conf - + ynh_script_progression --message="Starting a supervisor service..." ynh_supervisor_action --service_name="${app}-horizon" --action="start" --log_path="systemd" --line_match="success: ${app}-horizon" fi if dpkg --compare-versions "0.10.9~ynh3" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then ynh_script_progression --message="Ensuring upgrade compatibility to 0.10.9~ynh3..." - + if ynh_exec_warn_less yunohost service status ${app}-horizon >/dev/null then ynh_script_progression --message="Removing ${app}-horizon service..." yunohost service remove "${app}-horizon" fi - + ynh_script_progression --message="Integrating service in YunoHost..." yunohost service add "supervisor" --description="Supervisor daemon for $app" --log="/var/log/$app/${app}-horizon.log" fi @@ -150,7 +150,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Updating composer..." --weight=1 -ynh_exec_warn_less ynh_composer_exec --workdir="$install_dir" --commands="self-update" +ynh_exec_warn_less ynh_composer_exec --workdir="$install_dir" --commands="self-update --2" ynh_exec_warn_less ynh_composer_exec --workdir="$install_dir" --commands="update"