From b4f23aa5d240b71a5ad0e7ed6e821d87349e840c Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 5 Dec 2020 16:38:22 +0100 Subject: [PATCH] Added metadata to plannaplan propterties + we should create sssl bean instead inerting properties --- .../additional-spring-configuration-metadata.json | 14 ++++++++++++++ .../src/main/resources/application-dev.properties | 2 +- .../src/main/resources/application-prod.properties | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100755 restservice/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/restservice/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/restservice/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100755 index 0000000..e5a729a --- /dev/null +++ b/restservice/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,14 @@ +{ + "properties": [ + { + "name": "plannaplan.dev", + "type": "java.lang.String", + "description": "Should application create resorces for development or not" + }, + { + "name": "plannaplan.frontendUrl", + "type": "java.lang.String", + "description": "Url where frontend app is located" + } + ] +} diff --git a/restservice/src/main/resources/application-dev.properties b/restservice/src/main/resources/application-dev.properties index 2a28294..7b49197 100755 --- a/restservice/src/main/resources/application-dev.properties +++ b/restservice/src/main/resources/application-dev.properties @@ -10,4 +10,4 @@ spring.main.allow-bean-definition-overriding=true spring.jackson.default-property-inclusion = NON_NULL server.port=1285 plannaplan.dev = true -plannaplan.frontendUrl = http://localhost:3000 \ No newline at end of file +plannaplan.frontendUrl= http://localhost:3000 \ No newline at end of file diff --git a/restservice/src/main/resources/application-prod.properties b/restservice/src/main/resources/application-prod.properties index b8e7a83..46e3b11 100755 --- a/restservice/src/main/resources/application-prod.properties +++ b/restservice/src/main/resources/application-prod.properties @@ -12,7 +12,7 @@ spring.jackson.default-property-inclusion = NON_NULL server.port=1285 plannaplan.dev = false -plannaplan.frontendUrl = https://wmi.plannaplan.pl +plannaplan.frontendUrl= https://wmi.plannaplan.pl security.require-ssl=true server.ssl.key-store=/keys/keystore.p12 server.ssl.key-store-password=