diff --git a/conf/nginx.conf b/conf/nginx.conf index 319eef1..2dad80d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -7,7 +7,7 @@ location __PATH__/ { index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file - #client_max_body_size 50M; + client_max_body_size 50M; try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { diff --git a/manifest.toml b/manifest.toml index 39f7c09..f26d23d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -14,11 +14,14 @@ license = "GPL-3.0-or-later" website = "https://www.php.net/manual/fr/function.phpinfo.php" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" @@ -34,9 +37,9 @@ ram.runtime = "50M" [install.phpversion] ask.en = "Choose the version of PHP to use." ask.fr = "Choisissez la version de PHP à utiliser." - type = "string" + type = "select" choices = ["7.4", "8.0", "8.1", "8.2"] - default = "8.0" + default = "8.2" [resources] [resources.system_user] @@ -47,4 +50,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.0-fpm" \ No newline at end of file + packages = "php8.2-fpm" \ No newline at end of file diff --git a/scripts/restore b/scripts/restore index 08cbd68..3f991ef 100755 --- a/scripts/restore +++ b/scripts/restore @@ -26,12 +26,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Restoring the PHP-FPM configuration..." # Recreate a dedicated php-fpm config -ynh_add_fpm_config --usage=low --footprint=low - -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." +ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index fbdedec..dac6b85 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -36,12 +36,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low - -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config