Skip to content

Commit

Permalink
Merge branch 'master' of github.com:skylime/mi-core-kumquat
Browse files Browse the repository at this point in the history
  • Loading branch information
drscream committed Jan 24, 2019
2 parents 9ac4ffc + 808ecc0 commit a856434
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 119 deletions.
116 changes: 0 additions & 116 deletions copy/opt/local/etc/php-fpm.conf

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,9 @@ pm.max_requests = 500
;env[PATH] = /usr/local/bin:/usr/bin:/bin
env[TMP] = /var/tmp
env[TMPDIR] = /var/tmp
env[TMP_DIR] = /var/tmp
env[TEMP] = /var/tmp
env[TEMP_DIR] = /var/tmp

; Additional php.ini defines, specific to this pool of workers. These settings
; overwrite the values previously defined in the php.ini. The directives are the
Expand All @@ -393,7 +395,7 @@ env[TEMP] = /var/tmp
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] = 256M
php_admin_value[memory_limit] = 512M
php_admin_value[upload_tmp_dir] = /var/tmp
php_admin_value[upload_max_filesize] = 256M
php_admin_value[post_max_size] = 128M
php_admin_value[upload_max_filesize] = 512M
php_admin_value[post_max_size] = 256M

0 comments on commit a856434

Please sign in to comment.