diff --git a/data/conf/phpfpm/php-fpm.d/pools.conf b/data/conf/phpfpm/php-fpm.d/pools.conf index 0667c2bc..d6520948 100644 --- a/data/conf/phpfpm/php-fpm.d/pools.conf +++ b/data/conf/phpfpm/php-fpm.d/pools.conf @@ -26,7 +26,7 @@ listen = [::]:9002 access.log = /proc/self/fd/2 clear_env = no catch_workers_output = yes -php_admin_value[memory_limit] = 256M +php_admin_value[memory_limit] = 512M php_admin_value[max_execution_time] = 1200 php_admin_value[max_input_time] = 1200 diff --git a/data/conf/rspamd/lua/rspamd.local.lua b/data/conf/rspamd/lua/rspamd.local.lua index 92d223b1..3043ec86 100644 --- a/data/conf/rspamd/lua/rspamd.local.lua +++ b/data/conf/rspamd/lua/rspamd.local.lua @@ -15,13 +15,21 @@ rspamd_config:register_symbol({ local rspamd_logger = require "rspamd_logger" local rspamd_ip = require 'rspamd_ip' local uname = task:get_user() + if uname then return false end + local redis_params = rspamd_parse_redis_server('keep_spam') local ip = task:get_from_ip() + + if not ip then + return false + end + local from_ip_string = ip:to_string() ip_check_table = {from_ip_string} + local maxbits = 128 local minbits = 32 if ip:get_version() == 4 then diff --git a/helper-scripts/nextcloud.sh b/helper-scripts/nextcloud.sh index 3922f499..8dd8c0fd 100755 --- a/helper-scripts/nextcloud.sh +++ b/helper-scripts/nextcloud.sh @@ -64,7 +64,7 @@ elif [[ ${NC_INSTALL} == "y" ]]; then ADMIN_NC_PASS=$(