From 345b27bdf3accc02b8e4973f87b072f7b702e26f Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Mon, 29 Aug 2016 10:24:27 +0200
Subject: [PATCH] Reorganise configuration
---
docker/runner/config/application.tmpl | 20 ++++++++-----------
.../configuration/SecurityConfiguration.java | 4 ++--
.../eu/hbp/mip/controllers/ExperimentApi.java | 6 +++---
3 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/docker/runner/config/application.tmpl b/docker/runner/config/application.tmpl
index f36a33189..f6e1647e4 100644
--- a/docker/runner/config/application.tmpl
+++ b/docker/runner/config/application.tmpl
@@ -15,15 +15,10 @@ spring:
chain:
enabled: true # TODO: why is that enabled? Do we serve any resources from the backend?
-# SECURITY
-security:
- enabled: false # TODO: why Spring security is disabled? It supports OAuth2 out of the box...
-
-authentication:
- enabled: {{ default .Env.AUTHENTICATION "1" }}
-
# HBP OAUTH2 LOGIN
hbp:
+ authentication:
+ enabled: {{ default .Env.AUTHENTICATION "1" }}
client:
clientId: {{ default .Env.CLIENT_ID "996f97c5-a3ca-460e-b18b-00df3e2be89a" }}
clientSecret: {{ .Env.CLIENT_SECRET }}
@@ -62,8 +57,9 @@ endpoints:
endoint: /health
sentitive: false
-workflow:
- experimentUrl: {{ default .Env.WOKEN_URL "http://172.22.0.1:8087" }}/experiment
- listMethodsUrl: {{ default .Env.WOKEN_URL "http://172.22.0.1:8087" }}/list-methods
- miningMipUrl: {{ default .Env.WOKEN_URL "http://172.22.0.1:8087" }}/mining"
- miningExaremeUrl: {{ default .Env.EXAREME_URL "http://hbps2.chuv.ch:9090" }}/mining/query
+services:
+ woken:
+ experimentUrl: {{ default .Env.WOKEN_URL "http://172.22.0.1:8087" }}/experiment
+ listMethodsUrl: {{ default .Env.WOKEN_URL "http://172.22.0.1:8087" }}/list-methods
+ exareme:
+ miningExaremeUrl: {{ default .Env.EXAREME_URL "http://hbps2.chuv.ch:9090" }}/mining/query
diff --git a/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
index 79903529b..53035fa94 100644
--- a/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
@@ -75,9 +75,9 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
private UserRepository userRepository;
/**
- * Enable authentication (1) or disable it (0). Default is 1
+ * Enable HBP collab authentication (1) or disable it (0). Default is 1
*/
- @Value("#{'${authentication.enabled:1}'}")
+ @Value("#{'${hbp.authentication.enabled:1}'}")
private boolean authentication;
/**
diff --git a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
index cd3f0f23a..a849082ab 100644
--- a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
@@ -49,13 +49,13 @@ public class ExperimentApi {
private static final String EXAREME_LR_ALGO = "WP_LINEAR_REGRESSION";
- @Value("#{'${workflow.experimentUrl:http://dockerhost:8087/experiment}'}")
+ @Value("#{'${services.woken.experimentUrl:http://dockerhost:8087/experiment}'}")
private String experimentUrl;
- @Value("#{'${workflow.listMethodsUrl:http://dockerhost:8087/list-methods}'}")
+ @Value("#{'${services.woken.listMethodsUrl:http://dockerhost:8087/list-methods}'}")
private String listMethodsUrl;
- @Value("#{'${workflow.miningExaremeUrl:http://hbps2.chuv.ch:9090/mining/query}'}")
+ @Value("#{'${services.exareme.miningExaremeUrl:http://hbps2.chuv.ch:9090/mining/query}'}")
private String miningExaremeQueryUrl;
@Autowired
--
GitLab