From 21342215f8210216c3bce474052bfed2be061821 Mon Sep 17 00:00:00 2001
From: Baptiste Toulemonde <toulemonde@cines.fr>
Date: Tue, 1 Feb 2022 13:28:23 +0100
Subject: [PATCH] fix
---
src/main/resources/application-dev.properties | 35 +++++++++----------
.../resources/application-prod.properties | 34 ++++++++----------
.../resources/application-staging.properties | 29 ++++++---------
src/main/resources/application.properties | 29 ---------------
4 files changed, 41 insertions(+), 86 deletions(-)
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 308cb54..7680816 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -1,4 +1,9 @@
+# 1. For pretty print
+spring.jackson.serialization.indent-output=true
+
+#2. Application configuration.
+server.port=8080
# 3. MongoDB configuration.
#spring.data.mongodb.uri=mongodb://admin:adminadmin@mongo2.f2ds.svc.cluster.local:27017/fdp?authSource=admin
@@ -9,25 +14,6 @@ spring.data.mongodb.authentication-database=admin
spring.data.mongodb.username=admin
spring.data.mongodb.password=adminadmin
-
-
-spring.security.oauth2.client.provider.oidc.issuer-uri=https://iam-pillar.cloud.cnaf.infn.it/
-
-spring.security.oauth2.client.registration.oidc.client-id=a03a6ac2-acfe-4916-9d0f-db874ea94e75
-spring.security.oauth2.client.registration.oidc.client-secret=cLONCJ8MccdHwobCEMSl_sYDJGKpmBxH16SyiRIBx8XeoDa2ZLwzTvF_aVoEeOt3h2sNbZqltRqhfHKeI3g7Dw
-spring.security.oauth2.client.registration.oidc.scope=address,phone,openid,email,profile
-spring.security.oauth2.client.registration.oidc.redirect-uri=http://localhost:4200/callback
-
-
-# SMART HARVESTER Application Properties
-spring.profiles.active=@activatedProperties@
-# 1. For pretty print
-spring.jackson.serialization.indent-output=true
-
-#2. Application configuration.
-server.port=8080
-
-
# 4. Logging configuration.
logging.level.com.assignment.springboot.mongo=DEBUG
logging.pattern.console= %d{yyyy-MM-dd HH:mm:ss} - %msg%n
@@ -51,3 +37,14 @@ springdoc.model-and-view-allowed=false
# 8. Error Handling
server.error.whitelabel.enabled=false
server.error.path=/error
+
+#9. F2DS Settings Filename
+f2dp.settings.filename=/f2pconf/settings.json
+
+
+spring.security.oauth2.client.provider.oidc.issuer-uri=https://iam-pillar.cloud.cnaf.infn.it/
+
+spring.security.oauth2.client.registration.oidc.client-id=a03a6ac2-acfe-4916-9d0f-db874ea94e75
+spring.security.oauth2.client.registration.oidc.client-secret=cLONCJ8MccdHwobCEMSl_sYDJGKpmBxH16SyiRIBx8XeoDa2ZLwzTvF_aVoEeOt3h2sNbZqltRqhfHKeI3g7Dw
+spring.security.oauth2.client.registration.oidc.scope=address,phone,openid,email,profile
+spring.security.oauth2.client.registration.oidc.redirect-uri=http://localhost:4200/callback
\ No newline at end of file
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index 5805e4e..a96b8ce 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -8,26 +8,6 @@ spring.data.mongodb.uri=mongodb://admin:adminadmin@mongo2.f2ds.svc.cluster.local
#spring.data.mongodb.username=admin
#spring.data.mongodb.password=adminadmin
-
-
-spring.security.oauth2.client.provider.oidc.issuer-uri=https://iam-pillar.cloud.cnaf.infn.it/
-
-spring.security.oauth2.client.registration.oidc.client-id=a03a6ac2-acfe-4916-9d0f-db874ea94e75
-spring.security.oauth2.client.registration.oidc.client-secret=cLONCJ8MccdHwobCEMSl_sYDJGKpmBxH16SyiRIBx8XeoDa2ZLwzTvF_aVoEeOt3h2sNbZqltRqhfHKeI3g7Dw
-spring.security.oauth2.client.registration.oidc.scope=address,phone,openid,email,profile
-spring.security.oauth2.client.registration.oidc.redirect-uri=https://f2ds.eosc-pillar.eu/callback
-
-
-
-# SMART HARVESTER Application Properties
-spring.profiles.active=@activatedProperties@
-# 1. For pretty print
-spring.jackson.serialization.indent-output=true
-
-#2. Application configuration.
-server.port=8080
-
-
# 4. Logging configuration.
logging.level.com.assignment.springboot.mongo=DEBUG
logging.pattern.console= %d{yyyy-MM-dd HH:mm:ss} - %msg%n
@@ -51,3 +31,17 @@ springdoc.model-and-view-allowed=false
# 8. Error Handling
server.error.whitelabel.enabled=false
server.error.path=/error
+
+#9. F2DS Settings Filename
+f2dp.settings.filename=/f2pconf/settings.json
+
+
+spring.security.oauth2.client.provider.oidc.issuer-uri=https://iam-pillar.cloud.cnaf.infn.it/
+
+spring.security.oauth2.client.registration.oidc.client-id=a03a6ac2-acfe-4916-9d0f-db874ea94e75
+spring.security.oauth2.client.registration.oidc.client-secret=cLONCJ8MccdHwobCEMSl_sYDJGKpmBxH16SyiRIBx8XeoDa2ZLwzTvF_aVoEeOt3h2sNbZqltRqhfHKeI3g7Dw
+spring.security.oauth2.client.registration.oidc.scope=address,phone,openid,email,profile
+spring.security.oauth2.client.registration.oidc.redirect-uri=https://f2ds.eosc-pillar.eu/callback
+
+
+
diff --git a/src/main/resources/application-staging.properties b/src/main/resources/application-staging.properties
index 3927745..06e24dc 100644
--- a/src/main/resources/application-staging.properties
+++ b/src/main/resources/application-staging.properties
@@ -8,24 +8,6 @@ spring.data.mongodb.uri=mongodb://admin:adminadmin@mongo2.f2ds.svc.cluster.local
#spring.data.mongodb.username=admin
#spring.data.mongodb.password=adminadmin
-
-
-spring.security.oauth2.client.provider.oidc.issuer-uri=https://iam-pillar.cloud.cnaf.infn.it/
-
-spring.security.oauth2.client.registration.oidc.client-id=a03a6ac2-acfe-4916-9d0f-db874ea94e75
-spring.security.oauth2.client.registration.oidc.client-secret=cLONCJ8MccdHwobCEMSl_sYDJGKpmBxH16SyiRIBx8XeoDa2ZLwzTvF_aVoEeOt3h2sNbZqltRqhfHKeI3g7Dw
-spring.security.oauth2.client.registration.oidc.scope=address,phone,openid,email,profile
-spring.security.oauth2.client.registration.oidc.redirect-uri=https://f2ds-dev.eosc-pillar.eu/callback
-
-# SMART HARVESTER Application Properties
-spring.profiles.active=@activatedProperties@
-# 1. For pretty print
-spring.jackson.serialization.indent-output=true
-
-#2. Application configuration.
-server.port=8080
-
-
# 4. Logging configuration.
logging.level.com.assignment.springboot.mongo=DEBUG
logging.pattern.console= %d{yyyy-MM-dd HH:mm:ss} - %msg%n
@@ -49,3 +31,14 @@ springdoc.model-and-view-allowed=false
# 8. Error Handling
server.error.whitelabel.enabled=false
server.error.path=/error
+
+#9. F2DS Settings Filename
+f2dp.settings.filename=/f2pconf/settings.json
+
+spring.security.oauth2.client.provider.oidc.issuer-uri=https://iam-pillar.cloud.cnaf.infn.it/
+
+spring.security.oauth2.client.registration.oidc.client-id=a03a6ac2-acfe-4916-9d0f-db874ea94e75
+spring.security.oauth2.client.registration.oidc.client-secret=cLONCJ8MccdHwobCEMSl_sYDJGKpmBxH16SyiRIBx8XeoDa2ZLwzTvF_aVoEeOt3h2sNbZqltRqhfHKeI3g7Dw
+spring.security.oauth2.client.registration.oidc.scope=address,phone,openid,email,profile
+spring.security.oauth2.client.registration.oidc.redirect-uri=https://f2ds-dev.eosc-pillar.eu/callback
+
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index efc8f24..e455839 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,35 +1,6 @@
# SMART HARVESTER Application Properties
spring.profiles.active=@activatedProperties@
-# 1. For pretty print
-spring.jackson.serialization.indent-output=true
-#2. Application configuration.
-server.port=8080
-
-
-# 4. Logging configuration.
-logging.level.com.assignment.springboot.mongo=DEBUG
-logging.pattern.console= %d{yyyy-MM-dd HH:mm:ss} - %msg%n
-
-# 5. CORS
-cors.allowed-origins = http://localhost:4200
-
-# 6.JWT
-smartharvester.app.jwt.header=Authorization
-smartharvester.app.jwtSecret=dora
-smartharvester.app.jwtExpirationMs=86400000
-smartharvester.app.jwt.route.authentication.path=/auth
-smartharvester.app.jwt.route.authentication.refresh=/refresh
-
-# 7. Swagger
-springdoc.api-docs.path=/smart-docs
-springdoc.swagger-ui.path=/smart-harvester/open-api.html
-springdoc.model-and-view-allowed=false
-
-
-# 8. Error Handling
-server.error.whitelabel.enabled=false
-server.error.path=/error
--
GitLab