gfwleak/nezha-nz-talon
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.mesalab.cn/nezha/nz-talon.git into dev

Browse Source
This commit is contained in:
hyx
2021-08-09 17:42:48 +08:00
parent 82e7eab8bf 3564d79f56
commit 70da6cb473
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/resources/application-prod.yml
View File

@@ -1,10 +1,10 @@
confagent: confagent:
promtail: promtail:
cmdLine: /home/fang/loki/config.conf cmdLine: /opt/nezha/promtail/config.conf
config: /home/fang/loki/promtail.yml config: /opt/nezha/protail/promtail.yaml
defaultIP: 127.0.0.1 defaultIP: 127.0.0.1
startCmd: systemctl start promtail startCmd: systemctl start nz-promtail
stopCmd: systemctl stop promtail stopCmd: systemctl stop nz-promtail
logging: logging:
config: config/logback-spring.xml config: config/logback-spring.xml

10
src/main/resources/application.yml
View File

@@ -2,18 +2,18 @@ server:
tomcat: tomcat:
uri-encoding: UTF-8 uri-encoding: UTF-8
basedir: /opt/nezha/nz-talon/tmp basedir: /opt/nezha/nz-talon/tmp
port: 10090 port: 10092
servlet: servlet:
context-path: /nz-talon context-path: /nz-talon
spring: spring:
profiles: profiles:
active: dev active: prod
confagent: confagent:
tokenFile: src/main/resources/config/token.auth tokenFile: ./config/token.auth
authFile: src/main/resources/config/auth.yml authFile: ./config/auth.yml
versionFile: src/main/resources/config/promtail.version versionFile: ./config/promtail.version
promtail: promtail:
query: query:
auth: false auth: false