diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf deleted file mode 100644 index 700c37c..0000000 --- a/conf/extra_php-fpm.conf +++ /dev/null @@ -1,4 +0,0 @@ -; Additional php.ini defines, specific to this pool of workers. - -php_admin_value[upload_max_filesize] = 50M -php_admin_value[post_max_size] = 50M diff --git a/conf/nginx.conf b/conf/nginx.conf index 1f14638..b36dab4 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -22,7 +22,4 @@ location __PATH__/ { fastcgi_param SCRIPT_FILENAME $request_filename; } ### End of PHP configuration part - - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; } diff --git a/manifest.toml b/manifest.toml index ac4bde3..3b37b83 100644 --- a/manifest.toml +++ b/manifest.toml @@ -32,7 +32,7 @@ cpe = "???" fund = "???" [integration] -yunohost = ">= 11.2.30" +yunohost = ">= 12.0.9" helpers_version = "2.1" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] architectures = "all" @@ -129,7 +129,7 @@ ram.runtime = "50M" [resources.apt] # This will automatically install/uninstall the following apt packages # and implicitly define the $phpversion setting as 8.0 (if phpX.Y-foobar dependencies are listed) - packages = "mariadb-server, deb1, deb2, php8.0-foo, php8.0-bar" + packages = "mariadb-server, deb1, deb2, php8.3-foo, php8.3-bar" [resources.database] # This will automatically provision/deprovison a MySQL DB and store the corresponding credentials in settings $db_user, $db_name, $db_pwd diff --git a/scripts/install b/scripts/install index ebb82ea..fa67130 100755 --- a/scripts/install +++ b/scripts/install @@ -35,6 +35,9 @@ source /usr/share/yunohost/helpers foo="bar" ynh_app_setting_set --key=foo --value=$foo +ynh_app_setting_set --key=php_upload_max_filesize --value=50M +ynh_app_setting_set --key=php_post_max_size --value=50M + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 957e129..2401955 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,7 +30,10 @@ ynh_systemctl --service="$app" --action="stop" #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -#ynh_script_progression "Ensuring downward compatibility..." +ynh_script_progression "Ensuring downward compatibility..." + +ynh_app_setting_set_default --key=php_upload_max_filesize --value=50M +ynh_app_setting_set_default --key=php_post_max_size --value=50M ### N.B. : the following setting migration snippets are provided as *EXAMPLES* ### of what you may want to do in some cases (e.g. a setting was not defined on