Update firewall.py

plugins/php/versions/83/install.sh

@@ -9,9 +9,9 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
 
-version=8.3.31
+version=8.3.33
 PHP_VER=83
-md5_file_ok=66410cee07f4b2baeb0843140bb2a2b52ef930b5cf9b3d6e6d158b33aae8fa37
+md5_file_ok=e293ed620cec74651bb4a071317892a478aa6840fab22db45c72d77cd42f9676
 Install_php()
 {
 #------------------------ install start ------------------------------------#

plugins/php/versions/84/install.sh

@@ -9,9 +9,9 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
 
-version=8.4.22
+version=8.4.24
 PHP_VER=84
-md5_file_ok=696c0f6ad92e94c59059c1eb6e300842b8d050934226efcdf00f2a413cb083cf
+md5_file_ok=e127be09a8506f4327c5cfa78a614b00d210714484ec215ce0011b4a03c00731
 Install_php()
 {
 #------------------------ install start ------------------------------------#

plugins/php/versions/85/install.sh

@@ -9,9 +9,9 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
 
-version=8.5.7
+version=8.5.9
 PHP_VER=85
-md5_file_ok=01ba2ed1c2658dacf91bebc8be6a4885f69b811c7993831fc48e26107ab29985
+md5_file_ok=0db7855f25bcd0ab1d592cdb35e284d6f6a5d2ae0f6f621122e364cc39b708f4
 Install_php()
 {
 #------------------------ install start ------------------------------------#

plugins/sys-opt/tpl/linux.conf

@@ -46,7 +46,7 @@ vm.max_map_count = 262144
 # error:table full, dropping packet.
 net.nf_conntrack_max = 25000000
 net.netfilter.nf_conntrack_max = 25000000
-net.netfilter.ip_conntrack_tcp_timeout_established = 30
+# net.netfilter.ip_conntrack_tcp_timeout_established = 30
 net.netfilter.nf_conntrack_tcp_timeout_close_wait = 10
 net.netfilter.nf_conntrack_tcp_timeout_fin_wait = 5
 net.netfilter.nf_conntrack_tcp_timeout_time_wait = 5

web/admin/__init__.py

@@ -53,8 +53,8 @@ app.config["COMPRESS_MIN_SIZE"] = 500  # 最小压缩大小
 Compress(app)
 
 # 缓存配置
-cache = Cache(config={'CACHE_TYPE': 'simple'})
-cache.init_app(app, config={'CACHE_TYPE': 'simple'})
+cache = Cache(config={'CACHE_TYPE': 'SimpleCache'})
+cache.init_app(app, config={'CACHE_TYPE': 'SimpleCache'})
 
 # 静态文件配置
 app.static_folder = "../static"

web/utils/firewall.py

@@ -502,7 +502,7 @@ class Firewall(object):
             rep = r"PasswordAuthentication\s+(\w*)\s*\n"
             conf = re.sub(rep, "PasswordAuthentication no\n", conf)
         mw.writeFile(file, conf)
-        mw.execShell("systemctl restart sshd")
+        mw.execShell("which systemctl && systemctl restart sshd")
         mw.writeLog("SSH管理", msg)
         return mw.returnData(True, msg)
 
@@ -530,7 +530,7 @@ class Firewall(object):
             rep = r"PubkeyAuthentication\s+(\w*)\s*\n"
             content = re.sub(rep, "PubkeyAuthentication no\n", content)
         mw.writeFile(file, content)
-        mw.execShell("systemctl restart sshd")
+        mw.execShell("which systemctl && systemctl restart sshd")
         mw.writeLog("SSH管理", msg)
         return mw.returnData(True, msg)