Merge pull request #741 from midoks/dev

简单优化

plugins/sys-opt/index.html

@@ -7,6 +7,7 @@
 			<p onclick="pluginLogs('sys-opt','','msg_run_log', 20);">常用日志</p>
 			<p onclick="pluginLogs('sys-opt','','cron_run_log', 20);">任务日志</p>
 			<p onclick="pluginConfig('sys-opt','','hosts');">HOSTS</p>
+			<p onclick="pluginConfig('sys-opt','','resolv');">RESOLV</p>
 			<p onclick="pluginRollingLogs('sys-opt','','sys_run_log', 20);">系统日志</p>
 			<p onclick="pRead()">说明</p>
 		</div>

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')

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
 
 

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'},