浏览代码

[PHP-FPM] Increase PHP memory limit for "web" to 512M
[Helper] Nextcloud 14
[Rspamd] Fix KEEP_SPAM lua script: skip check if ip is false

André 7 年之前
父节点
当前提交
1499094b61
共有 3 个文件被更改,包括 10 次插入2 次删除
  1. 1 1
      data/conf/phpfpm/php-fpm.d/pools.conf
  2. 8 0
      data/conf/rspamd/lua/rspamd.local.lua
  3. 1 1
      helper-scripts/nextcloud.sh

+ 1 - 1
data/conf/phpfpm/php-fpm.d/pools.conf

@@ -26,7 +26,7 @@ listen = [::]:9002
 access.log = /proc/self/fd/2
 access.log = /proc/self/fd/2
 clear_env = no
 clear_env = no
 catch_workers_output = yes
 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_execution_time] = 1200
 php_admin_value[max_input_time] = 1200
 php_admin_value[max_input_time] = 1200
 
 

+ 8 - 0
data/conf/rspamd/lua/rspamd.local.lua

@@ -15,13 +15,21 @@ rspamd_config:register_symbol({
     local rspamd_logger = require "rspamd_logger"
     local rspamd_logger = require "rspamd_logger"
     local rspamd_ip = require 'rspamd_ip'
     local rspamd_ip = require 'rspamd_ip'
     local uname = task:get_user()
     local uname = task:get_user()
+
     if uname then
     if uname then
       return false
       return false
     end
     end
+
     local redis_params = rspamd_parse_redis_server('keep_spam')
     local redis_params = rspamd_parse_redis_server('keep_spam')
     local ip = task:get_from_ip()
     local ip = task:get_from_ip()
+
+    if not ip then
+      return false
+    end
+
     local from_ip_string = ip:to_string()
     local from_ip_string = ip:to_string()
     ip_check_table = {from_ip_string}
     ip_check_table = {from_ip_string}
+
     local maxbits = 128
     local maxbits = 128
     local minbits = 32
     local minbits = 32
     if ip:get_version() == 4 then
     if ip:get_version() == 4 then

+ 1 - 1
helper-scripts/nextcloud.sh

@@ -64,7 +64,7 @@ elif [[ ${NC_INSTALL} == "y" ]]; then
 
 
 	ADMIN_NC_PASS=$(</dev/urandom tr -dc A-Za-z0-9 | head -c 28)
 	ADMIN_NC_PASS=$(</dev/urandom tr -dc A-Za-z0-9 | head -c 28)
 
 
-	curl -L# -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/latest-13.tar.bz2" || { echo "Failed to download Nextcloud archive."; exit 1; } \
+	curl -L# -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/latest-14.tar.bz2" || { echo "Failed to download Nextcloud archive."; exit 1; } \
 	  && tar -xjf nextcloud.tar.bz2 -C ./data/web/ \
 	  && tar -xjf nextcloud.tar.bz2 -C ./data/web/ \
 	  && rm nextcloud.tar.bz2 \
 	  && rm nextcloud.tar.bz2 \
 	  && rm -rf ./data/web/nextcloud/updater \
 	  && rm -rf ./data/web/nextcloud/updater \