From aec2b09ee5adb4f14bdb671fe4342dbc5d61576b Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Tue, 29 Mar 2022 16:30:38 +0200 Subject: [PATCH] dovecot: add auto configuration --- .../2022.03.08/dovecot/applicationservice.yml | 1 + .../dovecot/dictionaries/22_dovecot.xml | 66 ++++++++++++++++++- .../2022.03.08/dovecot/funcs/dovecot.py | 11 ++++ .../image/preinstall/postfix_dovecot.sh | 2 +- .../dovecot/templates/autoconfig.conf | 12 ++++ .../dovecot/templates/config-v1.1.xml | 27 ++++++++ .../2022.03.08/dovecot/templates/revprox.crt | 2 + .../2022.03.08/dovecot/templates/revprox.key | 1 + 8 files changed, 120 insertions(+), 2 deletions(-) create mode 100644 seed/applicationservice/2022.03.08/dovecot/templates/autoconfig.conf create mode 100644 seed/applicationservice/2022.03.08/dovecot/templates/config-v1.1.xml create mode 100644 seed/applicationservice/2022.03.08/dovecot/templates/revprox.crt create mode 100644 seed/applicationservice/2022.03.08/dovecot/templates/revprox.key diff --git a/seed/applicationservice/2022.03.08/dovecot/applicationservice.yml b/seed/applicationservice/2022.03.08/dovecot/applicationservice.yml index 6246bebe..3482af25 100644 --- a/seed/applicationservice/2022.03.08/dovecot/applicationservice.yml +++ b/seed/applicationservice/2022.03.08/dovecot/applicationservice.yml @@ -5,3 +5,4 @@ depends: - relay-mail-client - ldap-client-fedora - oauth2-client + - nginx-common diff --git a/seed/applicationservice/2022.03.08/dovecot/dictionaries/22_dovecot.xml b/seed/applicationservice/2022.03.08/dovecot/dictionaries/22_dovecot.xml index 229fcd63..1348cb72 100644 --- a/seed/applicationservice/2022.03.08/dovecot/dictionaries/22_dovecot.xml +++ b/seed/applicationservice/2022.03.08/dovecot/dictionaries/22_dovecot.xml @@ -18,9 +18,15 @@ + /etc/nginx/conf.d/autoconfig.conf + + + well_known_filenames + revprox_ca_file + revprox_cert_file + revprox_key_file - revprox_ca_file /sysusers.d/1dovecot.conf /tmpfiles.d/0dovecot.conf /etc/dovecot/conf.d/10-logging.conf @@ -63,6 +69,7 @@ + @@ -70,6 +77,8 @@