From 2979def4dce78ddc3d5ae067fb4dccf2b08555dc Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Mon, 21 Nov 2022 10:42:36 +0800
Subject: [PATCH] up

---
 class/core/mw.py         |  8 ++++++++
 plugins/php-apt/index.py | 10 +---------
 plugins/php/index.py     | 10 +---------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/class/core/mw.py b/class/core/mw.py
index dcb79e8cc..d8f7fecf6 100755
--- a/class/core/mw.py
+++ b/class/core/mw.py
@@ -143,6 +143,14 @@ def systemdCfgDir():
     return "/tmp"
 
 
+def getSslCrt():
+    if os.path.exists('/etc/ssl/certs/ca-certificates.crt'):
+        return '/etc/ssl/certs/ca-certificates.crt'
+    if os.path.exists('/etc/pki/tls/certs/ca-bundle.crt'):
+        return '/etc/pki/tls/certs/ca-bundle.crt'
+    return ''
+
+
 def getOs():
     return sys.platform
 
diff --git a/plugins/php-apt/index.py b/plugins/php-apt/index.py
index ca4564113..cfac4c477 100755
--- a/plugins/php-apt/index.py
+++ b/plugins/php-apt/index.py
@@ -78,14 +78,6 @@ def status(version):
     return 'start'
 
 
-def getSslCrt():
-    if os.path.exists('/etc/ssl/certs/ca-certificates.crt'):
-        return '/etc/ssl/certs/ca-certificates.crt'
-    if os.path.exists('/etc/pki/tls/certs/ca-bundle.crt'):
-        return '/etc/pki/tls/certs/ca-bundle.crt'
-    return ''
-
-
 def contentReplace(content, version):
     service_path = mw.getServerDir()
     content = content.replace('{$ROOT_PATH}', mw.getRootDir())
@@ -184,7 +176,7 @@ def initReplace(version):
     install_ok = getServerDir() + "/" + version + "/install.ok"
     if not os.path.exists(install_ok):
         phpini = getConf(version)
-        ssl_crt = getSslCrt()
+        ssl_crt = mw.getSslCrt()
 
         cmd_openssl = "sed -i \"s#;openssl.cafile=#openssl.cafile=${crtPath}#\" " + \
             ssl_crt + "/etc/php.ini"
diff --git a/plugins/php/index.py b/plugins/php/index.py
index 16eb54b4f..88a17f1bf 100755
--- a/plugins/php/index.py
+++ b/plugins/php/index.py
@@ -109,21 +109,13 @@ def status(version):
     return 'start'
 
 
-def getSslCrt():
-    if os.path.exists('/etc/ssl/certs/ca-certificates.crt'):
-        return '/etc/ssl/certs/ca-certificates.crt'
-    if os.path.exists('/etc/pki/tls/certs/ca-bundle.crt'):
-        return '/etc/pki/tls/certs/ca-bundle.crt'
-    return ''
-
-
 def contentReplace(content, version):
     service_path = mw.getServerDir()
     content = content.replace('{$ROOT_PATH}', mw.getRootDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$PHP_VERSION}', version)
     content = content.replace('{$LOCAL_IP}', mw.getLocalIp())
-    content = content.replace('{$SSL_CRT}', getSslCrt())
+    content = content.replace('{$SSL_CRT}', mw.getSslCrt())
 
     if mw.isAppleSystem():
         # user = mw.execShell(