diff --git a/.docksal/etc/mysql/my.cnf b/.docksal/etc/mysql/my.cnf index 22ce790..1648455 100644 --- a/.docksal/etc/mysql/my.cnf +++ b/.docksal/etc/mysql/my.cnf @@ -3,4 +3,4 @@ # Enable slow query logging #long_query_time=1 #slow_query_log=1 -#slow_query_log_file=/dev/stdout \ No newline at end of file +#slow_query_log_file=/dev/stdout diff --git a/.docksal/etc/php/php-fpm.conf b/.docksal/etc/php/php-fpm.conf index e69de29..931fb4a 100644 --- a/.docksal/etc/php/php-fpm.conf +++ b/.docksal/etc/php/php-fpm.conf @@ -0,0 +1,4 @@ +; PHP FPM settings +[www] +; Maximum amount of memory a script may consume +;php_admin_value[memory_limit] = 256M diff --git a/.docksal/etc/php/php.ini b/.docksal/etc/php/php.ini index 287ffd7..7507bb1 100644 --- a/.docksal/etc/php/php.ini +++ b/.docksal/etc/php/php.ini @@ -1,4 +1,4 @@ -; PHP settings +; Global PHP settings [php] ; Maximum amount of memory a script may consume -;memory_limit = 256M \ No newline at end of file +;memory_limit = 1024M