You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/09/19 11:26:24 UTC
[incubator-dlab] branch DLAB-terraform updated: DLAB-000 added new
parameter for ss
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-terraform by this push:
new ae7a40f DLAB-000 added new parameter for ss
ae7a40f is described below
commit ae7a40f47249d66dabb9c5647f5445de3bf99be2
Author: bhliva <bo...@epam.com>
AuthorDate: Thu Sep 19 14:26:12 2019 +0300
DLAB-000 added new parameter for ss
---
services/self-service/self-service.yml | 1 +
.../dlab/backendapi/conf/SelfServiceApplicationConfiguration.java | 5 +++++
.../dlab/backendapi/dropwizard/listeners/MongoStartupListener.java | 1 +
3 files changed, 7 insertions(+)
diff --git a/services/self-service/self-service.yml b/services/self-service/self-service.yml
index bbd60c2..b571cf1 100644
--- a/services/self-service/self-service.yml
+++ b/services/self-service/self-service.yml
@@ -67,6 +67,7 @@ maxSessionDurabilityMilliseconds: 288000000
</#if>
serviceBaseName: SERVICE_BASE_NAME
+os: OPERATION_SYSTEM
server:
gzip:
enabled: true
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/conf/SelfServiceApplicationConfiguration.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/conf/SelfServiceApplicationConfiguration.java
index afa2871..d6392a5 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/conf/SelfServiceApplicationConfiguration.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/conf/SelfServiceApplicationConfiguration.java
@@ -128,6 +128,7 @@ public class SelfServiceApplicationConfiguration extends ServiceConfiguration {
private Map<String, String> guacamole;
private String serviceBaseName;
+ private String os;
private KeycloakConfiguration keycloakConfiguration = new KeycloakConfiguration();
@@ -270,4 +271,8 @@ public class SelfServiceApplicationConfiguration extends ServiceConfiguration {
public String getServiceBaseName() {
return serviceBaseName;
}
+
+ public String getOs() {
+ return os;
+ }
}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/MongoStartupListener.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/MongoStartupListener.java
index e912ed1..97a7de9 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/MongoStartupListener.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/MongoStartupListener.java
@@ -39,6 +39,7 @@ public class MongoStartupListener implements ServerLifecycleListener {
public void serverStarted(Server server) {
insertRoles();
settingsDAO.setServiceBaseName(configuration.getServiceBaseName());
+ settingsDAO.setConfOsFamily(configuration.getOs());
}
private void insertRoles() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org