diff --git a/check_process b/check_process index 38c40ba..81e54d1 100644 --- a/check_process +++ b/check_process @@ -15,9 +15,9 @@ # 0.30.0~ynh3 upgrade=1 from_commit=af190a49ec43b470a38b21d81887a1b457b333fa backup_restore=1 - multi_instance=0 + multi_instance=1 change_url=1 ;;; Upgrade options - ; commit=73f74039fb63adc555222d73ded6b43a64d41456 - name=Update check_process, 24 Jun 2019 + ; commit=af190a49ec43b470a38b21d81887a1b457b333fa + name=Merge pull request #11 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& diff --git a/conf/nginx.conf b/conf/nginx.conf index ce361ca..c9fb7eb 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -7,7 +7,7 @@ location __PATH__/ { index index.php __PATH__/_h5ai/public/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 500M; try_files $uri.html $uri $uri/ =404; diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index ab1a471..573704e 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] = 500M +php_admin_value[post_max_size] = 500M ; php_admin_flag[mail.add_x_header] = Off ; Other common parameters diff --git a/manifest.json b/manifest.json index 9639936..a0881a4 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "email": "alex.aubin@mailoo.org" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ diff --git a/scripts/backup b/scripts/backup index e0a77d8..140f309 100644 --- a/scripts/backup +++ b/scripts/backup @@ -29,6 +29,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) +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP diff --git a/scripts/install b/scripts/install index 83d2112..f18e215 100644 --- a/scripts/install +++ b/scripts/install @@ -88,6 +88,7 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # NGINX CONFIGURATION diff --git a/scripts/restore b/scripts/restore index d6afdf1..15ce2cf 100644 --- a/scripts/restore +++ b/scripts/restore @@ -30,6 +30,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # CHECK IF THE APP CAN BE RESTORED