pull/267/head
midoks 3 years ago
parent 0a84cbec9c
commit e337f0ffd7
  1. 12
      class/core/cert_request.py
  2. 11
      scripts/init.d/mw.tpl

@ -131,8 +131,8 @@ class cert_request:
if api_index in self.__config['apis']:
if 'expires' in self.__config['apis'][api_index] and 'directory' in self.__config['apis'][api_index]:
if time.time() < self.__config['apis'][api_index]['expires']:
self.__apis = self.__config['apis'][
api_index]['directory']
self.__apis = self.__config[
'apis'][api_index]['directory']
return self.__apis
# 尝试从官方获取获取
@ -276,12 +276,8 @@ class cert_request:
# 如果没有保存上一次的随机数或force=True时则重新获取新的随机数
if not self.__replay_nonce or force:
headers = {"User-Agent": self.__user_agent}
response = requests.get(
self.__apis['newNonce'],
timeout=self.__acme_timeout,
headers=headers,
verify=self.__verify
)
response = requests.get(self.__apis[
'newNonce'], timeout=self.__acme_timeout, headers=headers, verify=self.__verify)
self.__replay_nonce = response.headers["Replay-Nonce"]
return self.__replay_nonce

@ -202,6 +202,16 @@ mw_close_admin_path(){
fi
}
mw_debug(){
port=7200
if [ -f $mw_path/data/port.pl ];then
port=$(cat $mw_path/data/port.pl)
fi
cd /www/server/mdserver-web
gunicorn -b :$port -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 app:app
}
case "$1" in
'start') mw_start;;
'stop') mw_stop;;
@ -221,6 +231,7 @@ case "$1" in
'update_dev') mw_update_dev;;
'install_app') mw_install_app;;
'close_admin_path') mw_close_admin_path;;
'debug') mw_debug;;
'default')
cd $mw_path
port=7200

Loading…
Cancel
Save