update

setting.py

@@ -1,95 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 配置文件
-# ---------------------------------------------------------------------------------
-
-
-import time
-import sys
-import random
-import os
-
-pwd = os.getcwd()
-sys.path.append(pwd + '/class/core')
-
-import mw
-
-# cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-# info = mw.execShell(cmd)
-# p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-# p_debain = "/usr/local/lib/" + info[0].strip() + "/dist-packages"
-
-# sys.path.append(p)
-# sys.path.append(p_debain)
-
-import system_api
-cpu_info = system_api.system_api().getCpuInfo()
-workers = cpu_info[1]
-
-
-log_dir = os.getcwd() + '/logs'
-if not os.path.exists(log_dir):
-    os.mkdir(log_dir)
-
-# default port
-mw_port = "7200"
-if os.path.exists("data/port.pl"):
-    mw_port = mw.readFile('data/port.pl')
-    mw_port.strip()
-else:
-    import firewall_api
-    import common
-    common.initDB()
-    mw_port = str(random.randint(10000, 65530))
-    firewall_api.firewall_api().addAcceptPortArgs(mw_port, 'WEB面板', 'port')
-    mw.writeFile('data/port.pl', mw_port)
-
-bind = []
-if os.path.exists('data/ipv6.pl'):
-    bind.append('[0:0:0:0:0:0:0:0]:%s' % mw_port)
-else:
-    bind.append('0.0.0.0:%s' % mw_port)
-
-ssl_choose_file = 'ssl/choose.pl'
-if os.path.exists(ssl_choose_file):
-    ssl_choose = mw.readFile(ssl_choose_file).strip()
-    if mw.inArray(['local','nginx'],ssl_choose):
-        tmp_cert = 'ssl/'+ssl_choose+'/cert.pem'
-        tmp_private = 'ssl/'+ssl_choose+'/private.pem'
-        if os.path.exists(tmp_cert) and os.path.exists(tmp_private):
-            certfile = tmp_cert
-            keyfile  = tmp_private
-            ciphers = 'TLSv1 TLSv1.1 TLSv1.2 TLSv1.3'
-            ssl_version = 2
-
-# 初始安装时,自动生成安全路径
-if not os.path.exists('data/admin_path.pl'):
-    admin_path = mw.getRandomString(8)
-    mw.writeFile('data/admin_path.pl', '/' + admin_path.lower())
-
-if workers > 2:
-    workers = 1
-
-threads = workers * 1
-backlog = 512
-reload = False
-daemon = True
-worker_class = 'geventwebsocket.gunicorn.workers.GeventWebSocketWorker'
-timeout = 7200
-keepalive = 60
-preload_app = True
-capture_output = True
-access_log_format = '%(t)s %(p)s %(h)s "%(r)s" %(s)s %(L)s %(b)s %(f)s" "%(a)s"'
-loglevel = 'info'
-errorlog = log_dir + '/error.log'
-accesslog = log_dir + '/access.log'
-pidfile = log_dir + '/mw.pid'

web/setting.py

@@ -50,6 +50,19 @@ if os.path.exists(default_ipv6_file):
 else:
     bind.append('0.0.0.0:%s' % panel_port)
 
+
+ssl_choose_file = panel_dir+'/ssl/choose.pl'
+if os.path.exists(ssl_choose_file):
+    ssl_choose = mw.readFile(ssl_choose_file).strip()
+    if mw.inArray(['local','nginx'],ssl_choose):
+        tmp_cert = panel_dir+'/ssl/'+ssl_choose+'/cert.pem'
+        tmp_private = panel_dir+'/ssl/'+ssl_choose+'/private.pem'
+        if os.path.exists(tmp_cert) and os.path.exists(tmp_private):
+            certfile = tmp_cert
+            keyfile  = tmp_private
+            ciphers = 'TLSv1 TLSv1.1 TLSv1.2 TLSv1.3'
+            ssl_version = 2
+
 if workers > 2:
     workers = 1