change kk.config to server.config

vikoivun · Feb 10, 2016 · bea4c85 · bea4c85
1 parent d64b32e
commit bea4c85
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@
 /config/local.yml
 npm-debug.log
 .idea
+server.config
diff --git a/dev_server/getSettings.js b/dev_server/getSettings.js
@@ -19,7 +19,7 @@ export default function getOptions() {
     const nconf = new Provider()
     nconf.argv()
     nconf.env()
-    nconf.file({file: './kk.config'})
+    nconf.file({file: './server.config'})
     nconf.defaults(_.clone(defaults))
 
     const settings = _.pick(nconf.get(), Object.keys(defaults))

diff --git a/server/getSettings.js b/server/getSettings.js
@@ -19,7 +19,7 @@ export default function getOptions() {
     const nconf = new Provider()
     nconf.argv()
     nconf.env()
-    nconf.file({file: './kk.config'})
+    nconf.file({file: './server.config'})
     nconf.defaults(_.clone(defaults))
 
     const settings = _.pick(nconf.get(), Object.keys(defaults))