Merge branch 'Development'

dmp-backend/web/src/main/resources/config/application-production.properties

@@ -0,0 +1,101 @@
+dmp.domain = https://opendmp.eu
+
+####################PERSISTENCE OVERRIDES CONFIGURATIONS##########
+database.url=jdbc:postgresql://dmp-db:5432/dmptool
+database.username=dmptool
+database.password=CHANGEME
+
+####################ELASTIIC SEARCH TAGS OVERRIDES CONFIGURATIONS##########
+elasticsearch.host = tags-elastic-search
+elasticsearch.port = 9200
+elasticsearch.username=elastic
+elasticsearch.password=
+elasticsearch.index=dmps
+
+####################PDF OVERRIDES CONFIGURATIONS##########
+pdf.converter.url=http://docsbox-web/
+
+####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS##########
+configuration.externalUrls=externalUrls/ExternalUrls.xml
+configuration.rda=RDACommonStandards.txt
+configuration.h2020template=documents/h2020.docx
+configuration.h2020datasettemplate=documents/h2020_dataset.docx
+configuration.configurable_login_providers=ConfigurableLoginProviders.json
+configuration.doi_funder=DOI_Funder.json
+
+####################SPRING MAIL CONFIGURATIONS#################
+spring.mail.default-encoding=UTF-8
+spring.mail.host=
+spring.mail.username=
+spring.mail.password=
+spring.mail.port=25
+spring.mail.protocol=smtp
+spring.mail.test-connection=false
+spring.mail.properties.mail.smtp.auth=false
+spring.mail.properties.mail.smtp.starttls.enable=true
+
+#############FACEBOOK LOGIN CONFIGURATIONS#########
+facebook.login.clientId=
+facebook.login.clientSecret=
+facebook.login.namespace=opendmp
+
+#############GOOGLE LOGIN CONFIGURATIONS#########
+google.login.clientId=
+
+#############LINKEDIN LOGIN CONFIGURATIONS#########
+linkedin.login.clientId=
+linkedin.login.clientSecret=
+linkedin.login.redirect_uri=https://opendmp.eu/login/linkedin
+linkedin.login.user_info_url=https://api.linkedin.com/v2/me
+linkedin.login.user_email=https://api.linkedin.com/v2/emailAddress?q=members&projection=(elements*(handle~))
+linkedin.login.access_token_url=https://www.linkedin.com/uas/oauth2/accessToken
+
+#############TWITTER LOGIN CONFIGURATIONS#########
+twitter.login.clientId=
+twitter.login.clientSecret=
+twitter.login.redirect_uri=https://opendmp.eu/login/twitter
+
+#############B2 ACCESS CONFIGURATIONS#########
+b2access.externallogin.user_info_url=https://b2access-integration.fz-juelich.de:443/oauth2/userinfo
+b2access.externallogin.access_token_url=https://b2access-integration.fz-juelich.de:443/oauth2/token
+b2access.externallogin.redirect_uri=https://opendmp.eu/api/oauth/authorized/b2access
+b2access.externallogin.clientid=
+b2access.externallogin.clientSecret=
+
+#############ORCID CONFIGURATIONS#########
+orcid.login.client_id=
+orcid.login.client_secret=
+orcid.login.access_token_url=https://orcid.org/oauth/token
+orcid.login.redirect_uri=https://opendmp.eu/login/external/orcid
+
+#############OPENAIRE CONFIGURATIONS#########
+openaire.login.client_id=
+openaire.login.client_secret=
+openaire.login.access_token_url=
+openaire.login.redirect_uri=
+openaire.login.user_info_url=
+
+#############SPRING DATASOURCE CONFIGURATIONS#########
+spring.datasource.maxIdle: 10
+spring.datasource.max-active: 70
+spring.datasource.max-wait: 10000
+spring.datasource.validationQuery: select 1
+spring.datasource.removeAbandoned: true
+spring.datasource.removeAbandonedTimeout: 1
+spring.datasource.logAbandoned: true
+spring.datasource.testOnBorrow: true
+spring.datasource.testOnConnect: false
+spring.datasource.testWhileIdle: false
+
+#############CONFIRMATION EMAIL CONFIGURATIONS#########
+conf_email.expiration_time_seconds=14400
+conf_email.subject=OpenDMP email confirmation
+
+#############ZENODO CONFIGURATIONS#########
+zenodo.url=https://zenodo.org/api/
+zenodo.access_token=
+
+#############CONTACT EMAIL CONFIGURATIONS#########
+contact_email.mail=
+
+language.path=i18n/

dmp-backend/web/src/main/resources/config/application.properties

@@ -6,18 +6,19 @@ spring.profiles.active=devel
 eu.eudat.logic.proxy.allowed.host=https://eestore.paas2.uninett.no
 
 ####################Metrics##############
-management.endpoint.metrics.enabled=false
-management.metrics.enable.http=false
-management.metrics.enable.jvm=false
-management.metrics.enable.jdbc=false
-management.metrics.enable.tomcat=false
-management.metrics.enable.logback=false
-management.metrics.enable.hikaricp=false
-management.metrics.enable.cache=false
+management.endpoint.metrics.enabled=true
+management.metrics.enable.http=true
+management.metrics.enable.jvm=true
+management.metrics.enable.jdbc=true
+management.metrics.enable.tomcat=true
+management.metrics.enable.logback=true
+management.metrics.enable.hikaricp=true
+management.metrics.enable.cache=true
 management.endpoints.web.base-path=/
-management.endpoints.web.exposure.include=prometheus
+management.endpoints.web.exposure.include=prometheus,health,metrics
 management.endpoint.prometheus.enabled=true
 management.metrics.export.prometheus.enabled=true
+management.endpoint.health.show-details=always
 
 ####################INVITATION MAIL CONFIGURATIONS##############
 ####################GENERIC MAIL CONFIGURATIONS#################

dmp-backend/web/src/main/resources/logging/logback-production.xml

@@ -0,0 +1,33 @@
+<configuration debug="false">
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>logs/openDMP.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>logs/openDMP-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>30</maxHistory>
+            <totalSizeCap>3GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="eu.eudat" level="INFO" additivity="false">
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
+    <root level="info" additivity="false">
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>