From 4a08ae200e0a13b3464752cacc01b0a1aafefc1a Mon Sep 17 00:00:00 2001 From: Aine Date: Tue, 23 Aug 2022 13:55:53 +0300 Subject: [PATCH] postmoogle: feedback --- roles/matrix-bot-postmoogle/defaults/main.yml | 8 ++++++-- .../templates/systemd/matrix-bot-postmoogle.service.j2 | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/roles/matrix-bot-postmoogle/defaults/main.yml b/roles/matrix-bot-postmoogle/defaults/main.yml index 633d00999..c3b363f63 100644 --- a/roles/matrix-bot-postmoogle/defaults/main.yml +++ b/roles/matrix-bot-postmoogle/defaults/main.yml @@ -88,14 +88,18 @@ matrix_bot_postmoogle_federation: false matrix_bot_postmoogle_sentry: '' # Log level -matrix_bot_postmoogle_loglevel: '' +matrix_bot_postmoogle_loglevel: 'INFO' # Disable encryption matrix_bot_postmoogle_noencryption: false matrix_bot_postmoogle_domain: "{{ matrix_server_fqn_matrix }}" -matrix_bot_postmoogle_port: "25" +# in-container port +matrix_bot_postmoogle_port: '2525' + +# on-host port +matrix_bot_postmoogle_smtp_host_bind_port: '25' # Additional environment variables to pass to the postmoogle container # diff --git a/roles/matrix-bot-postmoogle/templates/systemd/matrix-bot-postmoogle.service.j2 b/roles/matrix-bot-postmoogle/templates/systemd/matrix-bot-postmoogle.service.j2 index d53686035..38eb89a65 100644 --- a/roles/matrix-bot-postmoogle/templates/systemd/matrix-bot-postmoogle.service.j2 +++ b/roles/matrix-bot-postmoogle/templates/systemd/matrix-bot-postmoogle.service.j2 @@ -23,7 +23,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-bot-postmoogle --read-only \ --network={{ matrix_docker_network }} \ --env-file={{ matrix_bot_postmoogle_config_path }}/env \ - -p {{ matrix_bot_postmoogle_port }}:{{ matrix_bot_postmoogle_port }} \ + -p {{ matrix_bot_postmoogle_smtp_host_bind_port }}:{{ matrix_bot_postmoogle_port }} \ --mount type=bind,src={{ matrix_bot_postmoogle_data_path }},dst=/data \ {% for arg in matrix_bot_postmoogle_container_extra_arguments %} {{ arg }} \