MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Separate configuration to different files

This commit is contained in:
George Kalampokis 2023-10-10 16:49:48 +03:00
parent d45867585f
commit 755c79b7af
14 changed files with 239 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dmp-backend/web/src/main/resources/config/actuator-dev.yml Normal file
View File

@ -0,0 +1,3 @@
endpoints:
prometheus:
sensitive: false

25
dmp-backend/web/src/main/resources/config/actuator.yml Normal file
View File

@ -0,0 +1,25 @@
management:
endpoint:
metrics:
enabled: true
prometheus:
enabled: true
health:
show-details: always
metrics:
enable:
http: true
jvm: true
jdbc: true
tomcat: true
logback: true
hikaricp: true
cache: true
export:
prometheus:
enabled: true
endpoints:
web:
base-path: /
exposure:
include: prometheus,health,metrics

18
dmp-backend/web/src/main/resources/config/application-devel.yml
View File

@ -1,20 +1,2 @@
spring:
datasource:
maxIdle: 10
minIdle: 5
maxActive: 10
audit: audit:
enable: false enable: false
email:
invite: classpath:templates/email/email.html
confirmation: classpath:templates/email/emailConfirmation.html
merge: classpath:templates/email/emailMergeConfirmation.html
unlink: classpath:templates/email/emailUnlinkConfirmation.html
dataset:
template: classpath:templates/email/emailAdmin.html
endpoints:
prometheus:
sensitive: false

230
dmp-backend/web/src/main/resources/config/application.yml
View File

@ -1,217 +1,15 @@
server:
port: 8081
tomcat:
threads:
max: 20
max-connections: 10000
management:
endpoint:
metrics:
enabled: true
prometheus:
enabled: true
health:
show-details: always
metrics:
enable:
http: true
jvm: true
jdbc: true
tomcat: true
logback: true
hikaricp: true
cache: true
export:
prometheus:
enabled: true
endpoints:
web:
base-path: /
exposure:
include: prometheus,health,metrics
mail:
subject: "Invitation to DMP Plan {dmpname}"
from: opendmp-dev@cite.gr
admin:
mail:
subject: "You have been invited to the Dataset Template {templateName}"
spring: spring:
servlet: jackson:
multipart: default-property-inclusion: non_null
max-file-size: 10MB config:
max-request-size: 10MB import: optional:classpath:config/app.env[.properties], optional:file:../config/app.env[.properties],
mail: optional:classpath:config/db.yml[.yml], optional:classpath:config/db-${spring.profiles.active}.yml[.yml], optional:file:../config/db-${spring.profiles.active}.yml[.yml],
default-encoding: UTF-8 optional:classpath:config/security.yml[.yml], optional:classpath:config/security-${spring.profiles.active}.yml[.yml], optional:file:../config/security-${spring.profiles.active}.yml[.yml],
host: hermes.local.cite.gr optional:classpath:config/server.yml[.yml], optional:classpath:config/server-${spring.profiles.active}.yml[.yml], optional:file:../config/server-${spring.profiles.active}.yml[.yml],
port: 25 optional:classpath:config/logging.yml[.yml], optional:classpath:config/logging-${spring.profiles.active}.yml[.yml], optional:file:../config/logging-${spring.profiles.active}.yml[.yml],
protocol: smtp optional:classpath:config/cache.yml[.yml], optional:classpath:config/cache-${spring.profiles.active}.yml[.yml], optional:file:../config/cache-${spring.profiles.active}.yml[.yml],
test-connection: false optional:classpath:config/actuator.yml[.yml], optional:classpath:config/actuator-${spring.profiles.active}.yml[.yml], optional:file:../config/actuator-${spring.profiles.active}.yml[.yml],
properties: optional:classpath:config/email.yml[.yml], optional:classpath:config/email-${spring.profiles.active}.yml[.yml], optional:file:../config/email-${spring.profiles.active}.yml[.yml],
mail: optional:classpath:config/elasticsearch.yml[.yml], optional:classpath:config/elasticsearch-${spring.profiles.active}.yml[.yml], optional:file:../config/elasticsearch-${spring.profiles.active}.yml[.yml],
smtp: optional:classpath:config/file-path.yml[.yml], optional:classpath:config/file-path-${spring.profiles.active}.yml[.yml], optional:file:../config/file-path-${spring.profiles.active}.yml[.yml],
auth: false optional:classpath:config/external.yml[.yml], optional:classpath:config/external-${spring.profiles.active}.yml[.yml], optional:file:../config/external-${spring.profiles.active}.yml[.yml]
starttls:
enable: false
elasticsearch:
host: localhost
port: 9200
username: elastic
password: ${ELASTIC_PASS:}
index: ${ELASTIC_INDEX:}
usingssl: false
certPath: ${ELASTIC_CERT_PATH:}
certKey: ${ELASTIC_CERT_KEY:}
innerHitsSize: 100
configuration:
externalUrls: externalUrls/ExternalUrls.xml
semantics: Semantics.json
h2020template: documents/h2020.docx
h2020datasettemplate: documents/h2020_dataset.docx
configurable_login_providers: configurableLoginProviders.json
pid_links: pidLinks.json
email:
invite: file:templates/email/email.html
confirmation: file:templates/email/emailConfirmation.html
merge: file:templates/email/emailMergeConfirmation.html
unlink: classpath:templates/email/emailUnlinkConfirmation.html
dataset:
template: file:templates/email/emailAdmin.html
notification:
finalised:
subject: "[OpenDMP] The {name} has been finalised"
template: classpath:templates/notifications/finalisedNotification.html
modified_finalised:
template: classpath:templates/notifications/modifiedFinalisedNotification.html
modified:
subject: "[OpenDMP] The {name} has been modified"
template: classpath:templates/notifications/modifiedNotification.html
publish:
subject: "[OpenDMP] The {name} has been published"
template: classpath:templates/notifications/publishNotification.html
rateInterval: 30000
maxRetries: 10
modifiedFinalised:
subject: "[OpenDMP] The {name} has been modified and finalised"
autouser:
root:
email: ${AUTOUSER_EMAIL:}
username: ${AUTOUSER_USER:}
password: ${AUTOUSER_PASS:}
facebook:
login:
clientId: ${FACEBOOK_CLIENT_ID:}
clientSecret: ${FACEBOOK_CLIENT_SECRET:}
namespace: ${FACEBOOK_NAMESPACE:}
google:
login:
clientId: ${GOOGLE_CLIENT_ID:}
linkedin:
login:
clientId: ${LINKEDIN_CLIENT_ID:}
clientSecret: ${LINKEDIN_CLIENT_SECRET:}
redirect_uri: http://localhost:4200/login/linkedin
user_info_url: https://api.linkedin.com/v2/me
user_email: https://api.linkedin.com/v2/emailAddress?q=members&projection=(elements*(handle~))
access_token_url: https://www.linkedin.com/uas/oauth2/accessToken
twitter:
login:
clientId: ${TWITTER_CLIENT_ID:}
clientSecret: ${TWITTER_CLIENT_SECRET:}
redirect_uri: http://localhost:4200/login/twitter
b2access:
externallogin:
user_info_url: https://b2access-integration.fz-juelich.de:443/oauth2/userinfo
access_token_url: https://b2access-integration.fz-juelich.de:443/oauth2/token
redirect_uri: http://opendmp.eu/api/oauth/authorized/b2access
clientid: ${B2ACCESS_CLIENT_ID:}
clientSecret: ${B2ACCESS_CLIENT_SECRET:}
database:
driver-class-name: org.postgresql.Driver
lock-fail-interval: 120000
url: ${DB_URL:}
username: ${DB_USER:}
password: ${DB_PASS:}
userguide:
path: dmp-backend/web/src/main/resources/material/user-guide
about:
path: dmp-backend/web/src/main/resources/material/about
termsofservice:
path: dmp-backend/web/src/main/resources/material/terms-of-service
glossary:
path: dmp-backend/web/src/main/resources/material/glossary
faq:
path: dmp-backend/web/src/main/resources/material/faq
logging:
config: classpath:logging/logback-${spring.profiles.active}.xml
temp:
temp: ${TEMP_STORAGE:}
file:
storage: ${FILE_STORAGE:}
zenodo:
affiliation: ARGOS
community: argos
login:
access_token_url: ${ZENODO_ACCESS_TOKEN_URL:}
client_id: ${ZENODO_CLIENT_ID:}
client_secret: ${ZENODO_CLIENT_SECRET:}
redirect_uri: http://localhost:4200/login/external/zenodo
pdf:
converter:
url: ${PDF_CONVERTER_URL:}
orcid:
login:
client_id: ${ORCID_CLIENT_ID:}
client_secret: ${ORCID_CLIENT_SECRET:}
access_token_url: https://orcid.org/oauth/token
redirect_uri: http://localhost:4200/login/external/orcid
openaire:
login:
client_id: ${OPENAIRE_CLIENT_ID:}
client_secret: ${OPENAIRE_CLIENT_SECRET:}
access_token_url: ${OPENAIRE_ACCESS_TOKEN_URL:}
redirect_uri: ${OPENAIRE_REDIRECT_URI:}
user_info_url: ${OPENAIRE_USER_INFO_URI:}
conf_email:
expiration_time_seconds: 14400
subject: "OpenDMP email confirmation"
publicapi:
host: devel.opendmp.eu
basePath: /srv
schema: https
contact_email:
mail: ${CONTACT_EMAIL:}
language:
path: dmp-frontend/src/assets/i18n/

5
dmp-backend/web/src/main/resources/config/db-dev.yml Normal file
View File

@ -0,0 +1,5 @@
spring:
datasource:
maxIdle: 10
minIdle: 5
maxActive: 10

6
dmp-backend/web/src/main/resources/config/db.yml Normal file
View File

@ -0,0 +1,6 @@
database:
driver-class-name: org.postgresql.Driver
lock-fail-interval: 120000
url: ${DB_URL:}
username: ${DB_USER:}
password: ${DB_PASS:}

10
dmp-backend/web/src/main/resources/config/elasticsearch.yml Normal file
View File

@ -0,0 +1,10 @@
elasticsearch:
host: localhost
port: 9200
username: elastic
password: ${ELASTIC_PASS:}
index: ${ELASTIC_INDEX:}
usingssl: false
certPath: ${ELASTIC_CERT_PATH:}
certKey: ${ELASTIC_CERT_KEY:}
innerHitsSize: 100

7
dmp-backend/web/src/main/resources/config/email-dev.yml Normal file
View File

@ -0,0 +1,7 @@
email:
invite: classpath:templates/email/email.html
confirmation: classpath:templates/email/emailConfirmation.html
merge: classpath:templates/email/emailMergeConfirmation.html
unlink: classpath:templates/email/emailUnlinkConfirmation.html
dataset:
template: classpath:templates/email/emailAdmin.html

53
dmp-backend/web/src/main/resources/config/email.yml Normal file
View File

@ -0,0 +1,53 @@
spring:
mail:
default-encoding: UTF-8
host: hermes.local.cite.gr
port: 25
protocol: smtp
test-connection: false
properties:
mail:
smtp:
auth: false
starttls:
enable: false
mail:
subject: "Invitation to DMP Plan {dmpname}"
from: opendmp-dev@cite.gr
admin:
mail:
subject: "You have been invited to the Dataset Template {templateName}"
email:
invite: file:templates/email/email.html
confirmation: file:templates/email/emailConfirmation.html
merge: file:templates/email/emailMergeConfirmation.html
unlink: classpath:templates/email/emailUnlinkConfirmation.html
dataset:
template: file:templates/email/emailAdmin.html
conf_email:
expiration_time_seconds: 14400
subject: "OpenDMP email confirmation"
contact_email:
mail: ${CONTACT_EMAIL:}
notification:
finalised:
subject: "[OpenDMP] The {name} has been finalised"
template: classpath:templates/notifications/finalisedNotification.html
modified_finalised:
template: classpath:templates/notifications/modifiedFinalisedNotification.html
modified:
subject: "[OpenDMP] The {name} has been modified"
template: classpath:templates/notifications/modifiedNotification.html
publish:
subject: "[OpenDMP] The {name} has been published"
template: classpath:templates/notifications/publishNotification.html
rateInterval: 30000
maxRetries: 10
modifiedFinalised:
subject: "[OpenDMP] The {name} has been modified and finalised"

8
dmp-backend/web/src/main/resources/config/external.yml Normal file
View File

@ -0,0 +1,8 @@
pdf:
converter:
url: ${PDF_CONVERTER_URL:}
publicapi:
host: devel.opendmp.eu
basePath: /srv
schema: https

31
dmp-backend/web/src/main/resources/config/file-path.yml Normal file
View File

@ -0,0 +1,31 @@
configuration:
externalUrls: externalUrls/ExternalUrls.xml
semantics: Semantics.json
h2020template: documents/h2020.docx
h2020datasettemplate: documents/h2020_dataset.docx
configurable_login_providers: configurableLoginProviders.json
pid_links: pidLinks.json
userguide:
path: dmp-backend/web/src/main/resources/material/user-guide
about:
path: dmp-backend/web/src/main/resources/material/about
termsofservice:
path: dmp-backend/web/src/main/resources/material/terms-of-service
glossary:
path: dmp-backend/web/src/main/resources/material/glossary
faq:
path: dmp-backend/web/src/main/resources/material/faq
temp:
temp: ${TEMP_STORAGE:}
file:
storage: ${FILE_STORAGE:}
language:
path: dmp-frontend/src/assets/i18n/

2
dmp-backend/web/src/main/resources/config/logging.yml Normal file
View File

@ -0,0 +1,2 @@
logging:
config: classpath:logging/logback-${spring.profiles.active}.xml

62
dmp-backend/web/src/main/resources/config/security.yml Normal file
View File

@ -0,0 +1,62 @@
autouser:
root:
email: ${AUTOUSER_EMAIL:}
username: ${AUTOUSER_USER:}
password: ${AUTOUSER_PASS:}
facebook:
login:
clientId: ${FACEBOOK_CLIENT_ID:}
clientSecret: ${FACEBOOK_CLIENT_SECRET:}
namespace: ${FACEBOOK_NAMESPACE:}
google:
login:
clientId: ${GOOGLE_CLIENT_ID:}
linkedin:
login:
clientId: ${LINKEDIN_CLIENT_ID:}
clientSecret: ${LINKEDIN_CLIENT_SECRET:}
redirect_uri: http://localhost:4200/login/linkedin
user_info_url: https://api.linkedin.com/v2/me
user_email: https://api.linkedin.com/v2/emailAddress?q=members&projection=(elements*(handle~))
access_token_url: https://www.linkedin.com/uas/oauth2/accessToken
twitter:
login:
clientId: ${TWITTER_CLIENT_ID:}
clientSecret: ${TWITTER_CLIENT_SECRET:}
redirect_uri: http://localhost:4200/login/twitter
b2access:
externallogin:
user_info_url: https://b2access-integration.fz-juelich.de:443/oauth2/userinfo
access_token_url: https://b2access-integration.fz-juelich.de:443/oauth2/token
redirect_uri: http://opendmp.eu/api/oauth/authorized/b2access
clientid: ${B2ACCESS_CLIENT_ID:}
clientSecret: ${B2ACCESS_CLIENT_SECRET:}
zenodo:
affiliation: ARGOS
community: argos
login:
access_token_url: ${ZENODO_ACCESS_TOKEN_URL:}
client_id: ${ZENODO_CLIENT_ID:}
client_secret: ${ZENODO_CLIENT_SECRET:}
redirect_uri: http://localhost:4200/login/external/zenodo
orcid:
login:
client_id: ${ORCID_CLIENT_ID:}
client_secret: ${ORCID_CLIENT_SECRET:}
access_token_url: https://orcid.org/oauth/token
redirect_uri: http://localhost:4200/login/external/orcid
openaire:
login:
client_id: ${OPENAIRE_CLIENT_ID:}
client_secret: ${OPENAIRE_CLIENT_SECRET:}
access_token_url: ${OPENAIRE_ACCESS_TOKEN_URL:}
redirect_uri: ${OPENAIRE_REDIRECT_URI:}
user_info_url: ${OPENAIRE_USER_INFO_URI:}

12
dmp-backend/web/src/main/resources/config/server.yml Normal file
View File

@ -0,0 +1,12 @@
server:
port: 8081
tomcat:
threads:
max: 20
max-connections: 10000
spring:
servlet:
multipart:
max-file-size: 10MB
max-request-size: 10MB