From 777d5ebd3bc67853bc289d1d8fa98c5b2e51c869 Mon Sep 17 00:00:00 2001
From: Aine <aine@etke.cc>
Date: Fri, 22 Sep 2023 20:10:51 +0300
Subject: [PATCH] update postmoogle 0.9.14 -> 0.9.15

---
 .../matrix-bot-postmoogle/defaults/main.yml   | 19 ++++++++++++++-----
 .../matrix-bot-postmoogle/templates/env.j2    |  7 ++++++-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/roles/custom/matrix-bot-postmoogle/defaults/main.yml b/roles/custom/matrix-bot-postmoogle/defaults/main.yml
index 56882bf1..556da53b 100644
--- a/roles/custom/matrix-bot-postmoogle/defaults/main.yml
+++ b/roles/custom/matrix-bot-postmoogle/defaults/main.yml
@@ -9,7 +9,7 @@ matrix_bot_postmoogle_docker_repo: "https://gitlab.com/etke.cc/postmoogle.git"
 matrix_bot_postmoogle_docker_repo_version: "{{ 'main' if matrix_bot_postmoogle_version == 'latest' else matrix_bot_postmoogle_version }}"
 matrix_bot_postmoogle_docker_src_files_path: "{{ matrix_base_data_path }}/postmoogle/docker-src"
 
-matrix_bot_postmoogle_version: v0.9.14
+matrix_bot_postmoogle_version: v0.9.15
 matrix_bot_postmoogle_docker_image: "{{ matrix_bot_postmoogle_docker_image_name_prefix }}etke.cc/postmoogle:{{ matrix_bot_postmoogle_version }}"
 matrix_bot_postmoogle_docker_image_name_prefix: "{{ 'localhost/' if matrix_bot_postmoogle_container_image_self_build else 'registry.gitlab.com/' }}"
 matrix_bot_postmoogle_docker_image_force_pull: "{{ matrix_bot_postmoogle_docker_image.endswith(':latest') }}"
@@ -65,12 +65,15 @@ matrix_bot_postmoogle_database_dialect: "{{
 
 
 # The bot's username. This user needs to be created manually beforehand.
-# Also see `matrix_bot_postmoogle_password`.
+# Also see `matrix_bot_postmoogle_password` or `matrix_bot_postmoogle_sharedsecret`
 matrix_bot_postmoogle_login: "postmoogle"
 
 # The password that the bot uses to authenticate.
 matrix_bot_postmoogle_password: ''
 
+# Alternative to password - shared secret requires matrix_bot_postmoogle_login to be MXID
+matrix_bot_postmoogle_sharedsecret: ''
+
 matrix_bot_postmoogle_homeserver: "{{ matrix_homeserver_container_url }}"
 
 # Command prefix
@@ -79,6 +82,12 @@ matrix_bot_postmoogle_prefix: '!pm'
 # Max email size in megabytes, including attachments
 matrix_bot_postmoogle_maxsize: '1024'
 
+# Optional SMTP relay mode
+matrix_bot_postmoogle_relay_host: ''
+matrix_bot_postmoogle_relay_port: ''
+matrix_bot_postmoogle_relay_username: ''
+matrix_bot_postmoogle_relay_password: ''
+
 # A list of admins
 # Example set of rules:
 # matrix_bot_postmoogle_admins:
@@ -102,9 +111,6 @@ matrix_bot_postmoogle_monitoring_healthchecks_duration: 60
 # Log level
 matrix_bot_postmoogle_loglevel: 'INFO'
 
-# Disable encryption
-matrix_bot_postmoogle_noencryption: false
-
 # deprecated, use matrix_bot_postmoogle_domains
 matrix_bot_postmoogle_domain: "{{ matrix_server_fqn_matrix }}"
 
@@ -147,6 +153,9 @@ matrix_bot_postmoogle_tls_required: false
 # trusted proxies
 matrix_bot_postmoogle_proxies: []
 
+# known forwarders
+matrix_bot_postmoogle_mailboxes_forwarded: []
+
 # reserved mailboxes
 matrix_bot_postmoogle_mailboxes_reserved: []
 
diff --git a/roles/custom/matrix-bot-postmoogle/templates/env.j2 b/roles/custom/matrix-bot-postmoogle/templates/env.j2
index 072d12da..8a3eb71b 100644
--- a/roles/custom/matrix-bot-postmoogle/templates/env.j2
+++ b/roles/custom/matrix-bot-postmoogle/templates/env.j2
@@ -1,5 +1,6 @@
 POSTMOOGLE_LOGIN={{ matrix_bot_postmoogle_login }}
 POSTMOOGLE_PASSWORD={{ matrix_bot_postmoogle_password }}
+POSTMOOGLE_SHAREDSECRET={{ matrix_bot_postmoogle_sharedsecret }}
 POSTMOOGLE_HOMESERVER={{ matrix_bot_postmoogle_homeserver }}
 POSTMOOGLE_DOMAINS={{ matrix_bot_postmoogle_domains | join(' ') }}
 POSTMOOGLE_PORT={{ matrix_bot_postmoogle_port }}
@@ -8,7 +9,6 @@ POSTMOOGLE_DB_DIALECT={{ matrix_bot_postmoogle_database_dialect }}
 POSTMOOGLE_PREFIX={{ matrix_bot_postmoogle_prefix }}
 POSTMOOGLE_MAXSIZE={{ matrix_bot_postmoogle_maxsize }}
 POSTMOOGLE_LOGLEVEL={{ matrix_bot_postmoogle_loglevel }}
-POSTMOOGLE_NOENCRYPTION={{ matrix_bot_postmoogle_noencryption }}
 POSTMOOGLE_ADMINS={{ matrix_bot_postmoogle_admins | join(' ') }}
 POSTMOOGLE_TLS_PORT={{ matrix_bot_postmoogle_tls_port }}
 POSTMOOGLE_TLS_CERT={{ matrix_bot_postmoogle_tls_cert }}
@@ -16,10 +16,15 @@ POSTMOOGLE_TLS_KEY={{ matrix_bot_postmoogle_tls_key }}
 POSTMOOGLE_TLS_REQUIRED={{ matrix_bot_postmoogle_tls_required }}
 POSTMOOGLE_DATA_SECRET={{ matrix_bot_postmoogle_data_secret }}
 POSTMOOGLE_PROXIES={{ matrix_bot_postmoogle_proxies | join(' ') }}
+POSTMOOGLE_RELAY_HOST={{ matrix_bot_postmoogle_relay_host }}
+POSTMOOGLE_RELAY_PORT={{ matrix_bot_postmoogle_relay_port }}
+POSTMOOGLE_RELAY_USERNAME={{ matrix_bot_postmoogle_relay_username }}
+POSTMOOGLE_RELAY_PASSWORD={{ matrix_bot_postmoogle_relay_password }}
 POSTMOOGLE_MONITORING_SENTRY_DSN={{ matrix_bot_postmoogle_monitoring_sentry_dsn }}
 POSTMOOGLE_MONITORING_SENTRY_RATE={{ matrix_bot_postmoogle_monitoring_sentry_rate }}
 POSTMOOGLE_MONITORING_HEALTHCHECKS_UUID={{ matrix_bot_postmoogle_monitoring_healthchecks_uuid }}
 POSTMOOGLE_MONITORING_HEALTHCHECKS_DURATION={{ matrix_bot_postmoogle_monitoring_healthchecks_duration }}
+POSTMOOGLE_MAILBOXES_FORWARDED={{ matrix_bot_postmoogle_mailboxes_forwarded | join(' ') }}
 POSTMOOGLE_MAILBOXES_RESERVED={{ matrix_bot_postmoogle_mailboxes_reserved | join(' ') }}
 POSTMOOGLE_MAILBOXES_ACTIVATION={{ matrix_bot_postmoogle_mailboxes_activation }}