Compare commits

..

2 Commits

Author SHA1 Message Date
9394ca597c fixed another bug
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-20 22:52:30 +01:00
d62534b3eb fixed plantuml permissions
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-20 22:20:17 +01:00
3 changed files with 15 additions and 11 deletions

View File

@@ -22,8 +22,9 @@ RUN adduser -D umbrella
COPY --from=java_build /Umbrella/backend/build/libs/backend.jar /home/umbrella/jar/
RUN chown -R umbrella /home/umbrella
ADD https://github.com/plantuml/plantuml/releases/download/v1.2025.10/plantuml-1.2025.10.jar /home/umbrella/plantuml.jar
USER umbrella
WORKDIR /home/umbrella
RUN chmod a+rx plantuml.jar
USER umbrella
RUN mkdir .config && ln -s /host/config.json .config/Umbrella.json
EXPOSE 80
CMD java -jar jar/backend.jar

View File

@@ -2,6 +2,7 @@
package de.srsoftware.umbrella.message;
public class Constants {
public static final String AUTH = "mail.smtp.auth";
public static final String CONFIG_DB = "umbrella.modules.message.database";
public static final String CONFIG_SMTP_HOST = "umbrella.modules.message.smtp.host";
@@ -10,11 +11,13 @@ public class Constants {
public static final String CONFIG_SMTP_USER = "umbrella.modules.message.smtp.user";
public static final String DEBUG_ADDREESS = "umbrella.modules.message.debug_address";
public static final String SMTP_AUTH = "mail.smtp.auth";
public static final String SMTP_HOST = "mail.smtp.host";
public static final String SMTP_FROM = "mail.smtp.from";
public static final String SMTP_PORT = "mail.smtp.port";
public static final String SMTP_SSL = "mail.smtp.ssl.enable";
public static final String ENVELOPE_FROM = "mail.smtp.from";
public static final String FIELD_MESSAGES = "messages";
public static final String FIELD_HOST = "host";
public static final String FIELD_PORT = "port";
public static final String HOST = "mail.smtp.host";
public static final String PORT = "mail.smtp.port";
public static final String SSL = "mail.smtp.ssl.enable";
public static final String SUBMISSION = "submission";
}

View File

@@ -142,11 +142,11 @@ public class MessageSystem implements PostBox {
private Session session() {
if (session == null){
Properties props = new Properties();
props.put(SMTP_HOST, host);
props.put(SMTP_PORT, port);
props.put(SMTP_AUTH, true);
props.put(SMTP_SSL, true);
props.put(SMTP_FROM,from);
props.put(HOST, host);
props.put(PORT, port);
props.put(AUTH, true);
props.put(SSL, true);
props.put(ENVELOPE_FROM,from);
session = Session.getInstance(props);
}
return session;