diff --git a/README.md b/README.md index e1328d9..ed44da3 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ In addition to Roundcube core features, the following are made available with th **Shipped version:** 1.6.0~ynh1 + **Demo:** https://demo.yunohost.org/webmail/ ## Screenshots diff --git a/README_fr.md b/README_fr.md index 6366152..40c4ee1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,8 @@ En plus des fonctionnalités principales de Roundcube, les éléments suivants s * Prise en charge du chiffrement PGP avec le plugin Enigma installé par default. -**Version incluse :** 1.6.0~ynh1 +**Version incluse :** 1.6.0~ynh1 + **Démo :** https://demo.yunohost.org/webmail/ diff --git a/conf/app.src b/conf/app.src index 3f7ef4e..aefdce3 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.6.0/roundcubemail-1.6.0-complete.tar.gz -SOURCE_SUM=2409ccdfe2e465f086cb9fc18c88dfe0aaf6ccc23924564975061209921694ba +SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.6.0/roundcubemail-1.6.0.tar.gz +SOURCE_SUM=1224eaf628888e503c49d0e8a69aa4997e566c3605738d0303d9c7a09722f363 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 7f4196e..f7c3927 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -5,7 +5,7 @@ location __PATH__/ { alias __FINALPATH__/ ; index index.php; - client_max_body_size 10G; + client_max_body_size 50M; try_files $uri $uri/ /index.php?q=$uri&$args; # pass PHP scripts to FastCGI server diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 61b251f..e8885d3 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -419,8 +419,8 @@ chdir = __FINALPATH__ ;php_admin_value[memory_limit] = 32M ; Common values to change to increase file upload limit -; php_admin_value[upload_max_filesize] = 50M -; php_admin_value[post_max_size] = 50M +php_admin_value[upload_max_filesize] = 50M +php_admin_value[post_max_size] = 50M ; php_admin_flag[mail.add_x_header] = Off ; Other common parameters diff --git a/manifest.json b/manifest.json index 7fdc88c..16a25cd 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.2" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 970cf36..d9237d1 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,10 +7,10 @@ YNH_PHP_VERSION="8.0" # Package dependencies -pkg_dependencies="php-pear php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-curl" +pkg_dependencies="php-pear php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-curl" # Composer version -YNH_COMPOSER_VERSION=2.3.7 +YNH_COMPOSER_VERSION=2.3.10 # Plugins version contextmenu_version=3.3.1 diff --git a/scripts/backup b/scripts/backup index 3167c87..6f4f9c1 100644 --- a/scripts/backup +++ b/scripts/backup @@ -26,7 +26,7 @@ app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -phpversion=$YNH_PHP_VERSION +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP diff --git a/scripts/upgrade b/scripts/upgrade index cbf0e91..0acf609 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,6 +172,10 @@ then #================================================= ynh_script_progression --message="Updating dependencies with Composer..." --weight=30 + # Install composer.json + cp "$final_path/composer.json-dist" "$final_path/composer.json" + + # Upgrade composer itself ynh_install_composer