diff --git a/plugins/sys-opt/index.html b/plugins/sys-opt/index.html index 5cafd566e..e230b24c3 100755 --- a/plugins/sys-opt/index.html +++ b/plugins/sys-opt/index.html @@ -7,6 +7,7 @@

常用日志

任务日志

HOSTS

+

RESOLV

系统日志

说明

diff --git a/plugins/sys-opt/index.py b/plugins/sys-opt/index.py index a92f6cddc..661b57afc 100755 --- a/plugins/sys-opt/index.py +++ b/plugins/sys-opt/index.py @@ -135,6 +135,9 @@ def systemRunLog(): def showHosts(): return '/etc/hosts' +def showResolv(): + return '/etc/resolv.conf' + if __name__ == "__main__": func = sys.argv[1] if func == 'status': @@ -163,5 +166,7 @@ if __name__ == "__main__": print(systemRunLog()) elif func == 'hosts': print(showHosts()) + elif func == 'resolv': + print(showResolv()) else: print('err') diff --git a/web/core/mw.py b/web/core/mw.py index 213a7506c..80d1bca18 100644 --- a/web/core/mw.py +++ b/web/core/mw.py @@ -1328,8 +1328,8 @@ def getAcmeDir(): cmd = "who | sed -n '2, 1p' |awk '{print $1}'" user = execShell(cmd)[0].strip() acme = '/Users/' + user + '/.acme.sh' - if not os.path.exists(acme): - acme = '/.acme.sh' + # if not os.path.exists(acme): + # acme = '/.acme.sh' return acme diff --git a/web/utils/site.py b/web/utils/site.py index 0b5800b3a..95ac5f5ce 100644 --- a/web/utils/site.py +++ b/web/utils/site.py @@ -1990,6 +1990,7 @@ location ^~ {from} {\n\ dnsapi_option = [ {"name":"none", "title":'手动解析', 'key':'', 'help':''}, {"name":"dns_ali", "title":'Aliyun', 'key':'Ali_Key:Ali_Secret', 'help':'阿里云控制台》用户头像》accesskeys按指引获取AccessKey/SecretKey'}, + {"name":"dns_huaweicloud", "title":'华为云', 'key':'HUAWEICLOUD_Username:HUAWEICLOUD_Password:HUAWEICLOUD_DomainName:HUAWEICLOUD_ProjectID:HUAWEICLOUD_AccessKey:HUAWEICLOUD_SecretKey'}, {"name":"dns_cf", "title":'cloudflare', 'key':'CF_Key:CF_Email', 'help':'CloudFlare后台获取Global API Key'}, {"name":"dns_dp", "title":'dnspod/国内', 'key':'DP_Id:DP_Key','help':'DnsPod后台》用户中心》安全设置,开启API Token'}, {"name":"dns_dpi", "title":'dnspod/国际', 'key':'DPI_Id:DPI_Key','help':'DnsPod后台》用户中心》安全设置,开启API Token'},