From c70cac58b2d5d4cd18d71740b37da604fb88257c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= <y0rune@aol.com>
Date: Fri, 4 Dec 2020 16:16:10 +0100
Subject: [PATCH] Updated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Woźniak <y0rune@aol.com>
---
 restservice/pom.xml                           | 18 +++++++++++++++++
 .../main/resources/application-dev.properties | 13 ++++++++++++
 .../resources/application-prod.properties     | 20 +++++++++++++++++++
 .../src/main/resources/application.properties | 16 +--------------
 4 files changed, 52 insertions(+), 15 deletions(-)
 create mode 100644 restservice/src/main/resources/application-dev.properties
 create mode 100644 restservice/src/main/resources/application-prod.properties

diff --git a/restservice/pom.xml b/restservice/pom.xml
index 773be7a..7c82417 100755
--- a/restservice/pom.xml
+++ b/restservice/pom.xml
@@ -16,6 +16,24 @@
   <!-- FIXME change it to the project's website -->
   <url>http://www.example.com</url>
 
+  <profiles>
+      <profile>
+          <id>dev</id>
+          <properties>
+              <activatedProperties>dev</activatedProperties>
+          </properties>
+          <activation>
+              <activeByDefault>true</activeByDefault>
+          </activation>
+      </profile>
+      <profile>
+          <id>prod</id>
+          <properties>
+              <activatedProperties>prod</activatedProperties>
+          </properties>
+      </profile>
+  </profiles>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>14</maven.compiler.source>
diff --git a/restservice/src/main/resources/application-dev.properties b/restservice/src/main/resources/application-dev.properties
new file mode 100644
index 0000000..2a28294
--- /dev/null
+++ b/restservice/src/main/resources/application-dev.properties
@@ -0,0 +1,13 @@
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
+spring.datasource.url=jdbc:mysql://localhost:3306/test?useUnicode=yes&characterEncoding=UTF-8
+spring.datasource.username=root
+spring.datasource.password=example
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.jpa.open-in-view=true
+spring.jpa.hibernate.ddl-auto=create-drop
+spring.jackson.serialization.fail-on-empty-beans=false
+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
diff --git a/restservice/src/main/resources/application-prod.properties b/restservice/src/main/resources/application-prod.properties
new file mode 100644
index 0000000..8ea6d44
--- /dev/null
+++ b/restservice/src/main/resources/application-prod.properties
@@ -0,0 +1,20 @@
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
+spring.datasource.url=jdbc:mysql://localhost:3306/test?useUnicode=yes&characterEncoding=UTF-8
+spring.datasource.username=root
+spring.datasource.password=example
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.jpa.open-in-view=true
+spring.jpa.hibernate.ddl-auto=create-drop
+spring.jackson.serialization.fail-on-empty-beans=false
+spring.main.allow-bean-definition-overriding=true
+spring.jackson.default-property-inclusion = NON_NULL
+
+server.port=1285
+
+plannaplan.dev = false
+plannaplan.frontendUrl = https://wmi.plannaplan.pl
+security.require-ssl=true
+server.ssl.key-store=/keys/keystore.p12
+server.ssl.key-store-password=
+server.ssl.keyStoreType=PKCS12
+server.ssl.keyAlias=tomcat
\ No newline at end of file
diff --git a/restservice/src/main/resources/application.properties b/restservice/src/main/resources/application.properties
index 27bae32..257b306 100755
--- a/restservice/src/main/resources/application.properties
+++ b/restservice/src/main/resources/application.properties
@@ -1,15 +1 @@
-spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
-spring.datasource.url=jdbc:mysql://localhost:3306/test?useUnicode=yes&characterEncoding=UTF-8
-spring.datasource.username=root
-spring.datasource.password=example
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.jpa.open-in-view=true
-spring.jpa.hibernate.ddl-auto=create-drop
-spring.jackson.serialization.fail-on-empty-beans=false
-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
+spring.profiles.active=dev
\ No newline at end of file