add smtp configuration options in env file

.env

@@ -11,8 +11,16 @@ SHANOIR_URL_HOST=shanoir-ng-nginx
 SHANOIR_VIEWER_OHIF_URL_SCHEME=https
 SHANOIR_VIEWER_OHIF_URL_HOST=viewer
 
-# SMTP relay used by shanoir for all outgoing mail
+# SMTP infos used by shanoir for all outgoing mail
 SHANOIR_SMTP_HOST=localhost
+SHANOIR_SMTP_PORT=25
+SHANOIR_SMTP_AUTH=false
+SHANOIR_SMTP_USERNAME=none
+SHANOIR_SMTP_PASSWORD=none
+SHANOIR_SMTP_STARTTLS_ENABLE=false
+SHANOIR_SMTP_STARTTLS_REQUIRED=false
+[email protected]
+
 
 # Name and e-mail address of the administrator (for signing outgoing e-mails)
 [email protected]

docker-compose/common/entrypoint_common

@@ -71,9 +71,16 @@ require()
             SHANOIR_INSTANCE_NAME)  match "$name" '^[^"\\]*$'				;;
             SHANOIR_INSTANCE_COLOR) match "$name" '^([A-Za-z]*|#[0-9a-fA-F]{3,6})$'	;;
             SHANOIR_KEYCLOAK_ADAPTER_MODE) match "$name" '^(login-required|check-sso)$'	;;
-            SHANOIR_ADMIN_EMAIL)    ;;
+            SHANOIR_ADMIN_EMAIL)  ;;
             SHANOIR_ADMIN_NAME)     ;;
-            SHANOIR_SMTP_HOST)      ;;
+			SHANOIR_SMTP_HOST) ;;
+			SHANOIR_SMTP_PORT) ;;
+			SHANOIR_SMTP_AUTH) match "$name" '^(true|false)$' ;;
+			SHANOIR_SMTP_USERNAME) ;;
+			SHANOIR_SMTP_PASSWORD) ;;
+			SHANOIR_SMTP_STARTTLS_ENABLE) match "$name" '^(true|false)$' ;;
+			SHANOIR_SMTP_STARTTLS_REQUIRED) match "$name" '^(true|false)$' ;;
+			SHANOIR_SMTP_FROM) ;;
             SHANOIR_CERTIFICATE_PEM_CRT) ;;
             SHANOIR_CERTIFICATE_PEM_KEY) ;;
             VIP_URL_SCHEME)         match "$name" '^(http|https)$'                      ;;

docker-compose/keycloak/cfg/shanoir-ng-realm.json

@@ -1816,9 +1816,13 @@
   },
   "smtpServer": {
     "host": "SHANOIR_SMTP_HOST",
+    "auth": "SHANOIR_SMTP_AUTH",
+    "starttls": "SHANOIR_SMTP_STARTTLS_ENABLE",
+    "password": "SHANOIR_SMTP_PASSWORD",
+    "user": "SHANOIR_SMTP_USERNAME",
     "from": "SHANOIR_ADMIN_EMAIL",
-    "fromDisplayName": "SHANOIR_ADMIN_NAME",
-    "port": "25"
+    "fromDisplayName": "SHANOIR_SMTP_FROM",
+    "port": "SHANOIR_SMTP_PORT"
   },
   "loginTheme": "shanoir-theme",
   "eventsEnabled": false,

docker-compose/keycloak/entrypoint

@@ -8,6 +8,12 @@ require  SHANOIR_ADMIN_EMAIL
 require  SHANOIR_ADMIN_NAME
 optional SHANOIR_PREFIX
 require  SHANOIR_SMTP_HOST
+require  SHANOIR_SMTP_PORT
+require  SHANOIR_SMTP_AUTH
+require  SHANOIR_SMTP_USERNAME
+require  SHANOIR_SMTP_PASSWORD
+require  SHANOIR_SMTP_STARTTLS_ENABLE
+require  SHANOIR_SMTP_FROM
 require  SHANOIR_URL_SCHEME
 require  SHANOIR_URL_HOST
 require  SHANOIR_VIEWER_OHIF_URL_SCHEME
@@ -17,6 +23,12 @@ mkdir -p /tmp/import
 sed "	s/SHANOIR_ADMIN_NAME/$SHANOIR_ADMIN_NAME/g
 		s/SHANOIR_ADMIN_EMAIL/$SHANOIR_ADMIN_EMAIL/g
 		s/SHANOIR_SMTP_HOST/$SHANOIR_SMTP_HOST/g
+		s/SHANOIR_SMTP_PORT/$SHANOIR_SMTP_PORT/g
+		s/SHANOIR_SMTP_AUTH/$SHANOIR_SMTP_AUTH/g
+		s/SHANOIR_SMTP_USERNAME/$SHANOIR_SMTP_USERNAME/g
+		s/SHANOIR_SMTP_PASSWORD/$SHANOIR_SMTP_PASSWORD/g
+		s/SHANOIR_SMTP_STARTTLS_ENABLE/$SHANOIR_SMTP_STARTTLS_ENABLE/g
+		s/SHANOIR_SMTP_FROM/$SHANOIR_SMTP_FROM/g
 		s/SHANOIR_URL_SCHEME/$SHANOIR_URL_SCHEME/g
 		s/SHANOIR_URL_HOST/$SHANOIR_URL_HOST/g
 		s/SHANOIR_VIEWER_OHIF_URL_SCHEME/$SHANOIR_VIEWER_OHIF_URL_SCHEME/g

shanoir-ng-users/src/main/resources/application.yml

@@ -1,12 +1,12 @@
 # Shanoir NG - Import, manage and share neuroimaging data
 # Copyright (C) 2009-2019 Inria - https://www.inria.fr/
 # Contact us on https://project.inria.fr/shanoir/
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -67,17 +67,23 @@ spring:
     store-type: none
   mail:
     host: ${SHANOIR_SMTP_HOST}
-    port: 25
+    port: ${SHANOIR_SMTP_PORT}
+    username: ${SHANOIR_SMTP_USERNAME}
+    password: ${SHANOIR_SMTP_PASSWORD}
     properties:
-      mail.smtp.from: [email protected]
+      mail.smtp.from: ${SHANOIR_SMTP_FROM}
+      mail.smtp.auth: ${SHANOIR_SMTP_AUTH}
+      mail.smtp.port: ${SHANOIR_SMTP_PORT}
+      mail.smtp.starttls.enable: ${SHANOIR_SMTP_STARTTLS_ENABLE}
+      mail.smtp.starttls.required: ${SHANOIR_SMTP_STARTTLS_REQUIRED}
   security:
     oauth2:
       resourceserver:
         jwt:
           issuer-uri: ${SHANOIR_URL_SCHEME}://${SHANOIR_URL_HOST}/auth/realms/shanoir-ng
 springdoc:
   api-docs:
-    path: '/api-docs'
+    path: "/api-docs"
     enabled: true
   swagger-ui:
     url: /shanoir-ng/users/api-docs
@@ -111,7 +117,6 @@ service-account:
     name: service-account-service-account
     email: ${VIP_SERVICE_EMAIL}
 
-
 ---
 ######################################
 # DO NOT COMMIT VALUES MODIFICATIONS #
@@ -146,14 +151,13 @@ spring:
 # logging configuration
 logging:
   pattern:
-    file: '%d{yyyy-MM-dd_HH:mm:ss.SSS} %-5level [%mdc{username}] %logger{35} - %msg%n'
+    file: "%d{yyyy-MM-dd_HH:mm:ss.SSS} %-5level [%mdc{username}] %logger{35} - %msg%n"
   file:
     name: /var/log/shanoir-ng-logs/shanoir-ng-users.log
   level:
     org.springframework.web: DEBUG
     org.hibernate: ERROR
-
-
+
 ---
 spring:
   config.activate.on-profile: test