diff --git a/check_process b/check_process index 121d126..8cd16db 100644 --- a/check_process +++ b/check_process @@ -11,6 +11,7 @@ setup_private=1 setup_public=1 upgrade=1 + upgrade=1 from_commit=42913fc917c98766b0cbba47a3b40148dffaac58 backup_restore=1 multi_instance=1 incorrect_path=1 @@ -30,3 +31,7 @@ ;;; Options Email= Notification=none +;;; Upgrade options + ; commit=42913fc917c98766b0cbba47a3b40148dffaac58 + name=Refactoring + manifest_arg=domain=DOMAIN&path=PATH&is_public=1& diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 7bad39e..cec73f5 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -389,4 +389,7 @@ catch_workers_output = yes ;php_flag[display_errors] = off ;php_admin_value[error_log] = /var/log/fpm-php.www.log ;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M \ No newline at end of file +;php_admin_value[memory_limit] = 32M + +php_admin_value[upload_max_filesize] = 30M +php_admin_value[post_max_size] = 30M diff --git a/conf/php-fpm.ini b/conf/php-fpm.ini deleted file mode 100644 index 55e2ba7..0000000 --- a/conf/php-fpm.ini +++ /dev/null @@ -1,3 +0,0 @@ -upload_max_filesize=30M -post_max_size=30M -; max_execution_time=60 \ No newline at end of file diff --git a/pull_request_template.md b/pull_request_template.md new file mode 100644 index 0000000..92edfdb --- /dev/null +++ b/pull_request_template.md @@ -0,0 +1,25 @@ +## Problem +- *Description of why you made this PR* + +## Solution +- *And how you fix that* + +## PR Status +- [ ] Code finished. +- [ ] Tested with Package_check. +- [ ] Fix or enhancement tested. +- [ ] Upgrade from last version tested. +- [ ] Can be reviewed and tested. + +## Validation +--- +*Minor decision* +- **Upgrade previous version** : +- [ ] **Code review** : +- [ ] **Approval (LGTM)** : +- [ ] **Approval (LGTM)** : +- **CI succeeded** : +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/zerobin_ynh%20-BRANCH-%20(Official)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/zerobin_ynh%20-BRANCH-%20(Official)/) *Please replace '-BRANCH-' in this link for a PR from a local branch.* +or +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/zerobin_ynh%20PR-NUM-%20(Official_fork)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/zerobin_ynh%20PR-NUM-%20(Official_fork)/) *Replace '-NUM-' by the PR number in this link for a PR from a forked repository.* +When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. diff --git a/scripts/backup b/scripts/backup index 6433b6e..01e8284 100644 --- a/scripts/backup +++ b/scripts/backup @@ -44,4 +44,3 @@ ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= ynh_backup "/etc/php5/fpm/pool.d/$app.conf" -ynh_backup "/etc/php5/fpm/conf.d/20-$app.ini" diff --git a/scripts/restore b/scripts/restore index 2840545..9551f33 100644 --- a/scripts/restore +++ b/scripts/restore @@ -66,7 +66,6 @@ chown -R $app:root $final_path/{data,tmp} #================================================= ynh_restore_file "/etc/php5/fpm/pool.d/$app.conf" -ynh_restore_file "/etc/php5/fpm/conf.d/20-$app.ini" #================================================= # GENERIC FINALIZATION