Compare commits
1 Commits
bugfix/pla
...
bugfix/mai
| Author | SHA1 | Date | |
|---|---|---|---|
| 8c351440c8 |
@@ -22,9 +22,8 @@ RUN adduser -D umbrella
|
|||||||
COPY --from=java_build /Umbrella/backend/build/libs/backend.jar /home/umbrella/jar/
|
COPY --from=java_build /Umbrella/backend/build/libs/backend.jar /home/umbrella/jar/
|
||||||
RUN chown -R umbrella /home/umbrella
|
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
|
ADD https://github.com/plantuml/plantuml/releases/download/v1.2025.10/plantuml-1.2025.10.jar /home/umbrella/plantuml.jar
|
||||||
WORKDIR /home/umbrella
|
|
||||||
RUN chmod a+rx plantuml.jar
|
|
||||||
USER umbrella
|
USER umbrella
|
||||||
|
WORKDIR /home/umbrella
|
||||||
RUN mkdir .config && ln -s /host/config.json .config/Umbrella.json
|
RUN mkdir .config && ln -s /host/config.json .config/Umbrella.json
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
CMD java -jar jar/backend.jar
|
CMD java -jar jar/backend.jar
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
package de.srsoftware.umbrella.message;
|
package de.srsoftware.umbrella.message;
|
||||||
|
|
||||||
public class Constants {
|
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_DB = "umbrella.modules.message.database";
|
||||||
public static final String CONFIG_SMTP_HOST = "umbrella.modules.message.smtp.host";
|
public static final String CONFIG_SMTP_HOST = "umbrella.modules.message.smtp.host";
|
||||||
@@ -11,13 +10,11 @@ public class Constants {
|
|||||||
public static final String CONFIG_SMTP_USER = "umbrella.modules.message.smtp.user";
|
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 DEBUG_ADDREESS = "umbrella.modules.message.debug_address";
|
||||||
public static final String ENVELOPE_FROM = "mail.smtp.from";
|
public static final String SMTP_AUTH = "mail.smtp.auth";
|
||||||
public static final String FIELD_MESSAGES = "messages";
|
public static final String SMTP_HOST = "mail.smtp.host";
|
||||||
public static final String FIELD_HOST = "host";
|
public static final String SMTP_FROM = "mail.smtp.from";
|
||||||
public static final String FIELD_PORT = "port";
|
public static final String SMTP_PORT = "mail.smtp.port";
|
||||||
public static final String HOST = "mail.smtp.host";
|
public static final String SMTP_SSL = "mail.smtp.ssl.enable";
|
||||||
public static final String PORT = "mail.smtp.port";
|
|
||||||
public static final String SSL = "mail.smtp.ssl.enable";
|
|
||||||
public static final String SUBMISSION = "submission";
|
public static final String SUBMISSION = "submission";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -142,11 +142,11 @@ public class MessageSystem implements PostBox {
|
|||||||
private Session session() {
|
private Session session() {
|
||||||
if (session == null){
|
if (session == null){
|
||||||
Properties props = new Properties();
|
Properties props = new Properties();
|
||||||
props.put(HOST, host);
|
props.put(SMTP_HOST, host);
|
||||||
props.put(PORT, port);
|
props.put(SMTP_PORT, port);
|
||||||
props.put(AUTH, true);
|
props.put(SMTP_AUTH, true);
|
||||||
props.put(SSL, true);
|
props.put(SMTP_SSL, true);
|
||||||
props.put(ENVELOPE_FROM,from);
|
props.put(SMTP_FROM,from);
|
||||||
session = Session.getInstance(props);
|
session = Session.getInstance(props);
|
||||||
}
|
}
|
||||||
return session;
|
return session;
|
||||||
|
|||||||
Reference in New Issue
Block a user