diff --git a/manifest.toml b/manifest.toml index b103b63..1c595c0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "PrivateBin" description.en = "Minimalist pastebin where the server has zero knowledge of pasted data" description.fr = "Pastebin minimaliste où le serveur n'a aucune connaissance des données copiées" -version = "1.5.1~ynh2" +version = "1.5.2~ynh1" maintainers = [""] @@ -17,7 +17,7 @@ admindoc = "https://github.com/PrivateBin/PrivateBin/wiki" code = "https://github.com/PrivateBin/PrivateBin" [integration] -yunohost = ">= 11.1.17" +yunohost = ">= 11.1.21" architectures = "all" multi_instance = true ldap = false @@ -42,9 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/PrivateBin/PrivateBin/archive/1.5.1.tar.gz" - sha256 = "d3c3d4b85afa6c429fd912ef8c8f46ee1e06b2b592afdd8a28890722d57c5bd8" - + url = "https://github.com/PrivateBin/PrivateBin/archive/1.5.2.tar.gz" + sha256 = "29647a51d711e4929c47bff517a22433c4994c888220c43609b33e7755832dde" [resources.system_user] @@ -54,5 +53,5 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.0-fpm" + packages = "php8.2-fpm" \ No newline at end of file diff --git a/scripts/install b/scripts/install index 7c3d870..9d60d01 100644 --- a/scripts/install +++ b/scripts/install @@ -45,11 +45,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - # Create a dedicated NGINX config ynh_add_nginx_config diff --git a/scripts/remove b/scripts/remove index 8a87488..0b31650 100644 --- a/scripts/remove +++ b/scripts/remove @@ -17,11 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index 88ab200..77f8af0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -27,11 +27,6 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 - ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 923c3da..b634c7e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -61,12 +61,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=3 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint - -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config