Ver código fonte

修改日志配置路径问题

dygapp 4 anos atrás
pai
commit
83ca311b6f
2 arquivos alterados com 20 adições e 38 exclusões
  1. 2 2
      app/controller/ipsecvpn.js
  2. 18 36
      config/filespath.js

+ 2 - 2
app/controller/ipsecvpn.js

@@ -24,7 +24,7 @@ class IpsecvpnController extends Controller {
       if (ipsecavpnStr && ipsecalog) {
       if (ipsecavpnStr && ipsecalog) {
         // 写入配置文件
         // 写入配置文件
         await this.service.fileshandler.write({ filePath: filePath.ipsecClient, str: ipsecavpnStr });
         await this.service.fileshandler.write({ filePath: filePath.ipsecClient, str: ipsecavpnStr });
-        await this.service.fileshandler.write({ filePath: filePath.swanlog, str: ipsecalog });
+        await this.service.fileshandler.write({ filePath: filePath.swanLogConf, str: ipsecalog });
       }
       }
       this.ctx.body = { errcode: 0, errmsg: '' };
       this.ctx.body = { errcode: 0, errmsg: '' };
     } catch (error) {
     } catch (error) {
@@ -50,7 +50,7 @@ class IpsecvpnController extends Controller {
       if (ipsecavpnStr && ipsecalog) {
       if (ipsecavpnStr && ipsecalog) {
         // 写入配置文件
         // 写入配置文件
         await this.service.fileshandler.write({ filePath: filePath.ipsecServer, str: ipsecavpnStr });
         await this.service.fileshandler.write({ filePath: filePath.ipsecServer, str: ipsecavpnStr });
-        await this.service.fileshandler.write({ filePath: filePath.swanlog, str: ipsecalog });
+        await this.service.fileshandler.write({ filePath: filePath.swanLogConf, str: ipsecalog });
       }
       }
       this.ctx.body = { errcode: 0, errmsg: '' };
       this.ctx.body = { errcode: 0, errmsg: '' };
     } catch (error) {
     } catch (error) {

+ 18 - 36
config/filespath.js

@@ -1,40 +1,22 @@
 'use strict';
 'use strict';
 
 
 module.exports = {
 module.exports = {
-  wan: '/etc/network/interfaces.d/wan',
-  // wan配置(可通过管理服务配置)
-  lan: '/etc/network/interfaces.d/br-lan',
-  // lan234桥接配置(可通过管理服务配置)
-  dhcp: '/etc/default/isc-dhcp-server',
-  // dhcp配置
-  dhcpd: '/etc/dhcp/dhcpd.conf',
-  // dhcp配置(可通过管理服务配置)
-  ipsecClient: '/ipsec/etc/swanctl/conf.d/client.conf',
-  // swan客户端配置文件(可通过管理服务配置)
-  ipsecServer: '/ipsec/etc/swanctl/conf.d/server.conf',
-  // swan服务端配置文件(可通过管理服务配置)
-  CAcert: '/ipsec/etc/swanctl/x509ca/',
-  // CA证书存放路径
-  cert: '/ipsec/etc/swanctl/x509/',
-  // 证书存放路径 (加密证书enc.cert)(签名证书sig.cert)
-  keys: '/ipsec/etc/swanctl/private/',
-  // 密钥存放路径(加密密钥enc.key)(签名证书sig.key)
-  p12: '/ipsec/etc/swanctl/pkcs12/',
-  // p12 存储位置
-  req: '/etc/vpn/req/',
-  // req存储位置
-  swanLogConf: '/ipsec/etc/strongswan.d/charon-logging.conf',
-  // swan日志配置文件
-  swanlog: '/var/log/charon.log',
-  // swan日志路径
-  ssllog: '/var/log/openvpn.log',
-  // sslvpn日志文件路径
-  sslConf: '/etc/openvpn/openvpn.conf',
-  // ssl配置文件
-  configJson: '/etc/vpn/config.json',
-  // 数据存放文件路径
-  resolv: '/etc/resolv.conf',
-  // 上层配置文件
-  systemctllog: '/usr/local/vpnserve/logs/vpnserve/common-error.log',
-  // 系统日志
+  wan: '/etc/network/interfaces.d/wan', // wan配置(可通过管理服务配置)
+  lan: '/etc/network/interfaces.d/br-lan', // lan234桥接配置(可通过管理服务配置)
+  dhcp: '/etc/default/isc-dhcp-server', // dhcp配置
+  dhcpd: '/etc/dhcp/dhcpd.conf', // dhcp配置(可通过管理服务配置)
+  ipsecClient: '/ipsec/etc/swanctl/conf.d/client.conf', // swan客户端配置文件(可通过管理服务配置)
+  ipsecServer: '/ipsec/etc/swanctl/conf.d/server.conf', // swan服务端配置文件(可通过管理服务配置)
+  CAcert: '/ipsec/etc/swanctl/x509ca/', // CA证书存放路径
+  cert: '/ipsec/etc/swanctl/x509/', // 证书存放路径 (加密证书enc.cert)(签名证书sig.cert)
+  keys: '/ipsec/etc/swanctl/private/', // 密钥存放路径(加密密钥enc.key)(签名证书sig.key)
+  p12: '/ipsec/etc/swanctl/pkcs12/', // p12 存储位置
+  req: '/etc/vpn/req/', // req存储位置
+  swanLogConf: '/ipsec/etc/strongswan.d/charon-logging.conf', // swan日志配置文件
+  swanlog: '/var/log/charon.log', // swan日志路径
+  ssllog: '/var/log/openvpn.log', // sslvpn日志文件路径
+  sslConf: '/etc/openvpn/openvpn.conf', // ssl配置文件
+  configJson: '/etc/vpn/config.json', // 数据存放文件路径
+  resolv: '/etc/resolv.conf', // 上层配置文件
+  systemctllog: '/usr/local/vpnserve/logs/vpnserve/common-error.log', // 系统日志
 };
 };