Skip to content

Commit

Permalink
Merge pull request #340 from linkernetworks/johnlin/config
Browse files Browse the repository at this point in the history
[Hot-fix] config reformat
  • Loading branch information
John-Lin authored Oct 5, 2018
2 parents 48a6365 + 0b127d6 commit 5306618
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 79 deletions.
48 changes: 21 additions & 27 deletions config/k8s.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,29 @@
{
"mongo": {
"url": "mongodb://mongo.vortex.svc.cluster.local:27017/vortex",
"public": {
"url": "mongodb://35.189.177.37:31717/votex"
}
"mongo":{
"url":"mongodb://mongo.vortex.svc.cluster.local:27017/vortex"
},
"prometheus": {
"url": "http://prometheus.vortex.svc.cluster.local:9090"
"prometheus":{
"url":"http://prometheus.vortex.svc.cluster.local:9090"
},
"registry": {
"url": "https://dockerhub.pw"
"registry":{
"url":"https://dockerhub.pw"
},
"kubernetes": {
"systemNamespace": "vortex"
"kubernetes":{
"systemNamespace":"vortex"
},
"logger": {
"dir": "./logs",
"level": "debug",
"maxAge": "720h",
"suffixPattern": ".%Y%m%d",
"linkName": "access_log"
"logger":{
"dir":"./logs",
"level":"debug",
"maxAge":"720h",
"suffixPattern":".%Y%m%d",
"linkName":"access_log"
},
"app": {
"brand": {
"name": "Vortex",
"identifier": "vortex",
"companyName": "Linker Networks Inc."
"app":{
"brand":{
"name":"Vortex",
"identifier":"vortex",
"companyName":"Linker Networks Inc."
},
"enableAuthentication": false,
"dbVersion": "v1.0.0",
"version": "<GIT_COMMIT>",
"logFileName": "access_log"
"logFileName":"access_log"
}
}
}
45 changes: 22 additions & 23 deletions config/local.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
{
"mongo": {
"url": "mongodb://localhost:27017/vortex_test"
"mongo":{
"url":"mongodb://localhost:27017/vortex_test"
},
"prometheus": {
"url": "http://localhost:30003"
"prometheus":{
"url":"http://localhost:30003"
},
"registry": {
"url": "https://dockerhub.pw"
"registry":{
"url":"https://dockerhub.pw"
},
"kubernetes": {
"systemNamespace": "vortex"
"kubernetes":{
"systemNamespace":"vortex"
},
"logger": {
"dir": "./logs",
"level": "debug",
"maxAge": "720h",
"suffixPattern": ".%Y%m%d",
"linkName": "access_log"
"logger":{
"dir":"./logs",
"level":"debug",
"maxAge":"720h",
"suffixPattern":".%Y%m%d",
"linkName":"access_log"
},
"app": {
"brand": {
"name": "Vortex",
"identifier": "vortex",
"companyName": "Linker Networks Inc."
"app":{
"brand":{
"name":"Vortex",
"identifier":"vortex",
"companyName":"Linker Networks Inc."
},
"dbVersion": "v1.0.0",
"version": "local",
"logFileName": "access_log"
"version":"local",
"logFileName":"access_log"
}
}
}
57 changes: 28 additions & 29 deletions config/testing.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
{
"mongo": {
"url": "mongodb://localhost:27017/vortex_test"
},
"prometheus": {
"url": "http://localhost:9090"
},
"registry": {
"url": "https://dockerhub.pw"
},
"kubernetes": {
"systemNamespace": "vortex"
},
"logger": {
"dir": "./logs",
"level": "debug",
"maxAge": "720h",
"suffixPattern": ".%Y%m%d",
"linkName": "access_log"
},
"app": {
"brand": {
"name": "Vortex",
"identifier": "vortex",
"companyName": "Linker Networks Inc."
"mongo":{
"url":"mongodb://localhost:27017/vortex_test"
},
"dbVersion": "v1.0.0",
"version": "local",
"logFileName": "access_log"
}
}
"prometheus":{
"url":"http://localhost:9090"
},
"registry":{
"url":"https://dockerhub.pw"
},
"kubernetes":{
"systemNamespace":"vortex"
},
"logger":{
"dir":"./logs",
"level":"debug",
"maxAge":"720h",
"suffixPattern":".%Y%m%d",
"linkName":"access_log"
},
"app":{
"brand":{
"name":"Vortex",
"identifier":"vortex",
"companyName":"Linker Networks Inc."
},
"version":"testing",
"logFileName":"access_log"
}
}

0 comments on commit 5306618

Please sign in to comment.