From f226d71cee219206fa11eae73128f8fb7970c9c6 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel.sambuc@epfl.ch>
Date: Wed, 14 Feb 2018 09:54:47 +0100
Subject: [PATCH] Allow configuration of the main features table in woken

---
 docker-compose.yml        | 2 +-
 settings.default.sh       | 3 ++-
 woken/application.conf.in | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 37b3fd7..55d9e0b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -201,7 +201,7 @@ services:
       FEATURES_DB_SERVER: ${DB_HOST}:${DB_PORT}
       FEATURES_DB_USER: ${DB_USER2}
       FEATURES_DB_PASSWORD: ${DB_PASSWORD2}
-      FEATURES_DB_MAIN_TABLE: cde_features_a
+      FEATURES_DB_MAIN_TABLE: ${WOKEN_MAIN_TABLE}
       CONTEXT_PATH: /services
       AUTHENTICATION: ${PORTAL_BACKEND_AUTHENTICATION}
       CLIENT_ID: ${PORTAL_BACKEND_CLIENT_ID}
diff --git a/settings.default.sh b/settings.default.sh
index 9aa00c3..e6bc809 100644
--- a/settings.default.sh
+++ b/settings.default.sh
@@ -92,9 +92,10 @@
 : ${WOKEN_IMAGE:="hbpmip/woken"}
 : ${WOKEN_VERSION:=":2.1.4"}
 : ${WOKEN_HOST:="woken"}
-: ${WOKEN_CONF:="${PWD}/woken/application.conf"}
 : ${WOKEN_PORT1:="8088"}
 : ${WOKEN_PORT2:="8087"}
+: ${WOKEN_CONF:="${PWD}/woken/application.conf"}
+: ${WOKEN_MAIN_TABLE:="cde_features_a"}
 : ${WOKEN_EXAREME_URL:="http://prozac.madgik.di.uoa.gr:9090/mining/query"}
 
 : ${WOKEN_VALIDATION_IMAGE:="hbpmip/woken-validation"}
diff --git a/woken/application.conf.in b/woken/application.conf.in
index cb12358..8d7e304 100644
--- a/woken/application.conf.in
+++ b/woken/application.conf.in
@@ -92,7 +92,7 @@ jobs {
   owner = "admin@mip.chuv.ch"
   chronosServerUrl = "http://CHRONOS_HOST:CHRONOS_PORT1"
   featuresDb = "DB_NAME2"
-  featuresTable = "cde_features_a"
+  featuresTable = "WOKEN_MAIN_TABLE"
   resultDb = "DB_NAME3"
   metaDb = "DB_NAME1"
 }