Load config correctly

common/src/main/scala/io/prediction/authentication/KeyAuthentication.scala

@@ -20,11 +20,9 @@ import scala.concurrent.Future
 trait KeyAuthentication {
 
  object ServerKey {
- val serverConfig = ConfigFactory.parseFile(new File("conf/server.conf"))
-
- val key = serverConfig.getString("server.accessKey")
- def get: String = key
- def param: String = "accessKey"
+ private val config = ConfigFactory.load("server.conf")
+ val get = config.getString("io.prediction.server.accessKey")
+ val param = "accessKey"
  }
 
  def withAccessKeyFromFile: RequestContext => Future[Authentication[HttpRequest]] = {

common/src/main/scala/io/prediction/configuration/SSLConfiguration.scala

@@ -14,11 +14,11 @@ import spray.io.ServerSSLEngineProvider
 
 trait SSLConfiguration {
 
- private val serverConfig = ConfigFactory.parseFile(new File("conf/server.conf"))
+ private val serverConfig = ConfigFactory.load("server.conf")
 
- private val keyStoreResource = serverConfig.getString("server.ssl-keystore-resource")
- private val password = serverConfig.getString("server.ssl-keystore-pass")
- private val keyAlias = serverConfig.getString("server.ssl-key-alias")
+ private val keyStoreResource = serverConfig.getString("io.prediction.server.ssl-keystore-resource")
+ private val password = serverConfig.getString("io.prediction.server.ssl-keystore-pass")
+ private val keyAlias = serverConfig.getString("io.prediction.server.ssl-key-alias")
 
  private val keyStore = {
 

conf/server.conf

@@ -1,5 +1,5 @@
 # Engine and dashboard Server related configurations
-server {
+io.prediction.server {
 
  # This access key is used by io.prediction.authentication.KeyAuthentication
  # to authenticate Evalutaion Dashboard, and Engine Server /stop and /reload enpoints