diff --git a/pom.xml b/pom.xml
index e08146ef2398fe89b1f1c04c24c71bf07a508479..f9c84d85d6d01e7dd02f56fbf4c52db6d87b908f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -265,6 +265,7 @@
<include>**/*.csv</include>
<include>**/*.sql</include>
<include>**/*.conf</include>
+ <include>**/*.yml</include> <!-- Only for development -->
</includes>
<filtering>true</filtering>
</resource>
diff --git a/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java b/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
index bca25598a6e59827a6a938e30fc9db1b9b5d5614..909d2c1c81dc040c78bba7c29d4f43bcb1e925ca 100644
--- a/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
@@ -29,7 +29,6 @@ public class PersistenceConfiguration {
return DataSourceBuilder.create().build();
}
-
@Bean(name = "entityManagerFactory")
@DependsOn("flyway")
public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
deleted file mode 100644
index e2abfd5ae7f2a4e0e3ceb4abc888cdb065dbc79f..0000000000000000000000000000000000000000
--- a/src/main/resources/application.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-app {
- # Name of the application
- name = "Portal backend"
- # Type of the application
- type = "Spring"
- clusterSystemName = ${clustering.cluster.name}
-}
-
-clustering {
- ip = "127.0.0.1"
- ip = ${?CLUSTER_IP}
- port = 4489
- port = ${?CLUSTER_PORT}
-}
-
-akka {
- cluster {
- roles = ["portal"]
- }
-}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
new file mode 100644
index 0000000000000000000000000000000000000000..825692ef70c731e54d1061293ec06d4dc8d1ab61
--- /dev/null
+++ b/src/main/resources/application.yml
@@ -0,0 +1,75 @@
+# Configuration template for the portal running inside a Docker container
+
+# See http://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html
+spring:
+ portal-datasource:
+ url: "jdbc:postgresql://127.0.0.1:5433/portal"
+ schema: "public"
+ username: "portal"
+ password: "portalpwd"
+ driver-class-name: org.postgresql.Driver
+
+ data:
+ jpa:
+ repositories:
+ bootstrap-mode: default
+ jpa:
+ hibernate:
+ dialect: org.hibernate.dialect.PostgreSQL9Dialect
+ ddl-auto: validate
+
+# HBP OAUTH2 LOGIN
+hbp:
+ authentication:
+ enabled: true
+ client:
+ clientId: "MIP"
+ clientSecret: "dae83a6b-c769-4186-8383-f0984c6edf05"
+ logoutUri: http://127.0.0.1/auth/realms/MIP/protocol/openid-connect/logout
+
+
+# WEB FRONTEND
+frontend:
+ loginUrl: "http://127.0.0.1/services/login/hbp"
+ redirectAfterLoginUrl: "http://127.0.0.1/"
+ redirectAfterLogoutUrl: "http://127.0.0.1/services/login/hbp"
+
+logging:
+ level:
+ root: "DEBUG"
+ org: "DEBUG"
+ eu:
+ hbp: "DEBUG"
+
+# EMBEDDED SERVER CONFIGURATION
+server:
+ servlet:
+ contextPath: "/services"
+ port: 8080
+ forward-headers-strategy: native
+ session:
+ timeout: "2592000"
+
+# ENDPOINTS
+endpoints:
+ enabled: true
+ health:
+ enabled: true
+ endpoint: "/health"
+ sensitive: false
+
+# External Services
+services:
+ exareme:
+ queryExaremeUrl: "http://127.0.0.1:9090/mining/query"
+ algorithmsUrl: "http://127.0.0.1:9090/mining/algorithms.json"
+
+ galaxy:
+ galaxyUrl: "http://127.0.0.1:8090"
+ galaxyContext: "nativeGalaxy/workflows/list"
+ galaxyApiKey: "d14a4cc5eebf805eb2ff261374ed08a2"
+ galaxyUsername: "admin"
+ galaxyPassword: "password"
+
+ keycloak:
+ keycloakUrl: 127.0.0.1
\ No newline at end of file
diff --git a/src/main/resources/kamon.conf b/src/main/resources/kamon.conf
deleted file mode 100644
index face394cba2325ea855db49c88219256c610a333..0000000000000000000000000000000000000000
--- a/src/main/resources/kamon.conf
+++ /dev/null
@@ -1,75 +0,0 @@
-kamon {
- enabled = no
- enabled = ${?KAMON_ENABLED}
-
- environment {
- service = "portal-backend"
- service = ${?KAMON_SERVICE_NAME}
- }
-
- zipkin = {
- enabled = no
- enabled = ${?ZIPKIN_ENABLED}
- host = "zipkin"
- host = ${?ZIPKIN_IP}
- port = 9411
- port = ${?ZIPKIN_PORT}
- }
-
- prometheus = {
- enabled = no
- enabled = ${?PROMETHEUS_ENABLED}
- host = "prometheus"
- host = ${?PROMETHEUS_IP}
- port = 9090
- port = ${?PROMETHEUS_PORT}
- }
-
- util.filters {
- "akka.tracked-actor" {
- includes = ["**"]
- }
-
- "akka.tracked-dispatcher" {
- includes = ["**"]
- }
-
- "akka.traced-actor" {
- includes = ["**"]
- excludes = [
- ${clustering.cluster.name}"/system/IO**",
- ${clustering.cluster.name}"/user/Stream**",
- ${clustering.cluster.name}"/system/transports**",
- ${clustering.cluster.name}"/system/cluster**",
- ${clustering.cluster.name}"/system/remote**",
- ${clustering.cluster.name}"/system/endpointmanager/**",
- ${clustering.cluster.name}"/system/sharding/UserActor/**"]
- }
-
- }
-
- akka-http {
- add-http-status-code-as-metric-tag = true
- }
-
- akka {
- ask-pattern-timeout-warning = lightweight
- }
-
- trace {
- join-remote-parents-with-same-span-id = yes
- sampler = "always"
- }
-
- system-metrics {
- host {
- enabled = no
- enabled = ${?SIGAR_SYSTEM_METRICS}
- }
- jvm {
- enabled = no
- enabled = ${?JVM_SYSTEM_METRICS}
- }
- }
-
-}