diff --git a/conf/0.9.8.src b/conf/0.9.8.src deleted file mode 100644 index 074f42e..0000000 --- a/conf/0.9.8.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-0.9.8.1.tar.bz2 -SOURCE_SUM=7cc64b51c9721c2dd7ee510f245bcfc4693ee07f74581ad74003906eb4716ef1 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.bz2 -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= - diff --git a/manifest.json b/manifest.json index ed32e14..2d9f89b 100644 --- a/manifest.json +++ b/manifest.json @@ -21,12 +21,12 @@ "email": "win10@tutanota.com" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ "nginx", - "php7.4-fpm" + "php8.0-fpm" ], "arguments": { "install": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 23826e6..ff2385c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app #pkg_dependencies="imagemagick" -YNH_PHP_VERSION="7.4" +YNH_PHP_VERSION="8.0" extra_php_dependencies="php${YNH_PHP_VERSION} php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-cli" diff --git a/scripts/upgrade b/scripts/upgrade index 9574a8e..3b01163 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -89,54 +89,6 @@ if [ -d "$skel_dist" ]; then cp -a "$skel_dist" /tmp/skel-dist fi -#================================================= -# UPGRADE TO 0.9.8 if necessary -#================================================= - -if ynh_compare_current_package_version --comparison lt --version 0.9.8.1~ynh1 -then - ynh_script_progression --message="Upgrading to 0.9.8" --weight=5 - # Download, check integrity, uncompress and patch the source from 0.9.8.src - ynh_setup_source --keep="config.local.php" --dest_dir="$final_path" --source_id="0.9.8" - # Set permissions on app files - ynh_system_user_create --username=$app - ynh_add_nginx_config - ynh_install_app_dependencies "$extra_php_dependencies" - ynh_add_fpm_config - phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - ynh_script_progression --message="restore data..." --weight=10 - - backup_bdd=/tmp/association.sqlite - backup_squelettes=/tmp/squelettes - - if [ -d "$backup_squelettes" ] - then - cp -a "$backup_squelettes" $final_path/www/squelettes - fi - - if [ -e "$backup_bdd" ] - then - cp -a "$backup_bdd" $final_path/association.sqlite - fi - - chown -R $app:$app $final_path - chmod 755 $final_path - - # Temporarily enable visitors for curl if needed - visitors_enabled=$(ynh_permission_has_user "main" "visitors" && echo yes || echo no) - if [[ $visitors_enabled == "no" ]]; then - ynh_permission_update --permission "main" --add "visitors" - fi - - # Finalize the upgrade - ynh_local_curl "/index.php" - sleep 5 - ynh_local_curl "/index.php" - - if [[ $visitors_enabled == "no" ]]; then - ynh_permission_update --permission "main" --remove "visitors" - fi -fi #================================================= # UPGRADE TO 1.1.0 if necessary #=================================================