From bea4c850134b0fd86e2bfab243e062933cd3fd99 Mon Sep 17 00:00:00 2001
From: Ville Touronen <touronen@gmail.com>
Date: Wed, 10 Feb 2016 15:23:57 +0200
Subject: [PATCH] change kk.config to server.config

---
 .gitignore                | 1 +
 dev_server/getSettings.js | 2 +-
 server/getSettings.js     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 82c553894..4862cb8d8 100644
--- 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
index f7bb17f1e..b168a0137 100644
--- 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
index 8dae98794..f0415e2a8 100644
--- 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))