diff --git a/manifest.toml b/manifest.toml index 354c391..17675b8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "ProxiTok" description.en = "Alternative frontend for TikTok" description.fr = "Frontend alternatif à TikTok" -version = "2.4.9.2~ynh1" +version = "2.5.0.0~ynh1" maintainers = [] @@ -16,7 +16,7 @@ demo = "https://proxitok.herokuapp.com/" code = "https://github.com/pablouser1/ProxiTok" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.27" architectures = "all" multi_instance = true ldap = false @@ -35,8 +35,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/pablouser1/ProxiTok/archive/refs/tags/v2.4.9.2.tar.gz" - sha256 = "f39f3d2a720569b4967fb58bf35e08948231deaecc237bf37bae6927b6b69d3c" + url = "https://github.com/pablouser1/ProxiTok/archive/refs/tags/v2.5.0.0.tar.gz" + sha256 = "c0f23873519ed0cff9eeadeb212a64a672d7a7ab548386ef9b463c75b19fc743" autoupdate.strategy = "latest_github_tag" [resources.system_user] @@ -51,4 +51,4 @@ ram.runtime = "50M" api.protected = true [resources.apt] - packages = "php8.2-xml php8.2-zip php8.2-redis php8.2-mbstring php8.2-curl" + packages = "php8.3-xml, php8.3-zip, php8.3-redis, php8.3-mbstring, php8.3-curl" diff --git a/scripts/backup b/scripts/backup index 18f83fe..c5c603d 100755 --- a/scripts/backup +++ b/scripts/backup @@ -27,10 +27,6 @@ ynh_backup --src_path="$install_dir" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= diff --git a/scripts/change_url b/scripts/change_url index 129b18c..4ba8cf7 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,7 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers - #================================================= # MODIFY URL IN NGINX CONF #================================================= diff --git a/scripts/install b/scripts/install index adbfb1d..46babd9 100755 --- a/scripts/install +++ b/scripts/install @@ -9,23 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS FROM THE MANIFEST -#================================================= - -fpm_footprint="low" -fpm_free_footprint=0 -fpm_usage="low" - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= -ynh_script_progression --message="Storing installation settings..." --weight=1 - -ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -42,7 +25,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config @@ -52,7 +35,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/.env" --destination="$install_dir/.env" +ynh_add_config --template=".env" --destination="$install_dir/.env" chmod 400 "$install_dir/.env" chown $app:$app "$install_dir/.env" diff --git a/scripts/upgrade b/scripts/upgrade index c236bc5..bc7e44c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,46 +9,13 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# 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 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 - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=1 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=1 - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" #--keep=".env" -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" #--keep=".env" chown -R $app:www-data "$install_dir" @@ -58,7 +25,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config @@ -68,7 +35,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/.env" --destination="$install_dir/.env" +ynh_add_config --template=".env" --destination="$install_dir/.env" chmod 400 "$install_dir/.env" chown $app:$app "$install_dir/.env"