Merge Master Bugfix back to Development

src/main/resources/config/application-prod.yml

@@ -46,19 +46,23 @@ spring:
         useServerPrepStmts: true
   # jpa:
   # elasticsearch:
-    # rest:
-      # set by spring config
-      # uris: http://sharing_elasticsearch:9200
+  # rest:
+  # set by spring config
+  # uris: http://sharing_elasticsearch:9200
   # Replace by 'prod, faker' to add the faker context and have sample data loaded in production
   liquibase:
     contexts: prod
   mail:
     host: smtp.uibk.ac.at
     port: 25
+    from: artemis-support-informatik@uibk.ac.at
     username: ${MAIL_USERNAME}
     password: ${MAIL_PASSWORD}
-    from: no-reply@uibk.ac.at
-    enabled: true
+    smtp:
+      auth: true
+      starttls:
+        enable: true
+        required: true
   thymeleaf:
     cache: true
   security: