From 2dd0b160c31d6277ce4a4c7a40ddc4a074735a42 Mon Sep 17 00:00:00 2001 From: Alejandro Mendez Date: Mon, 26 Mar 2018 11:26:52 -0600 Subject: [PATCH 1/3] Adding custom_mta_authenticators We need add authenticators to exim --- vh-mail/templates.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vh-mail/templates.py b/vh-mail/templates.py index 66fc668..09c2561 100644 --- a/vh-mail/templates.py +++ b/vh-mail/templates.py @@ -425,6 +425,8 @@ begin authenticators +%(custom_mta_authenticators)s + login: driver = plaintext public_name = LOGIN From e45d7daa8736f05ad1b8b47bdbba1b5acd5cbdd7 Mon Sep 17 00:00:00 2001 From: Alejandro Mendez Date: Mon, 26 Mar 2018 11:36:19 -0600 Subject: [PATCH 2/3] Authenticators api.py Config for atuhenticators --- vh-mail/api.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vh-mail/api.py b/vh-mail/api.py index 4d4d276..c28fc5b 100644 --- a/vh-mail/api.py +++ b/vh-mail/api.py @@ -28,6 +28,7 @@ def __init__(self, j): self.custom_mta_routers = j.get('custom_mta_routers', '') self.custom_mta_local_router = j.get('custom_mta_local_router', '') self.custom_mta_transports = j.get('custom_mta_transports', '') + self.custom_mta_authenticators = j.get('custom_mta_authenticators', '') self.dkim_enable = j.get('dkim_enable', False) self.dkim_selector = j.get('dkim_selector', 'x') self.dkim_private_key = j.get('dkim_private_key', '') @@ -51,6 +52,7 @@ def save(self): 'custom_mta_local_router': self.custom_mta_local_router, 'custom_mta_config': self.custom_mta_config, 'custom_mta_transports': self.custom_mta_transports, + 'custom_mta_authenticators' : self.custom_mta_authenticators, 'dkim_enable': self.dkim_enable, 'dkim_selector': self.dkim_selector, 'dkim_private_key': self.dkim_private_key, @@ -205,6 +207,7 @@ def configure(self, config): 'custom_mta_local_router': config.custom_mta_local_router, 'custom_mta_config': config.custom_mta_config, 'custom_mta_transports': config.custom_mta_transports, + 'custom_mta_authenticators': config.custom_mta_authenticators, 'dkim_enable': 'DKIM_ENABLE=1' if config.dkim_enable else '', 'dkim_selector': config.dkim_selector, 'dkim_private_key': config.dkim_private_key, @@ -426,4 +429,4 @@ def restart(self): ServiceMultiplexor.get().get_one(platform_select( debian='courier-authdaemon', centos='courier-authlib', - )).restart() \ No newline at end of file + )).restart() From cf31cfbace4dffe7eba7c0251ba37cf139055d84 Mon Sep 17 00:00:00 2001 From: Alejandro Mendez Date: Mon, 26 Mar 2018 11:39:17 -0600 Subject: [PATCH 3/3] Authenticators layout change Adding formline to allow custom authenticators --- vh-mail/layout/main.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vh-mail/layout/main.xml b/vh-mail/layout/main.xml index 44f7813..e7b8a3d 100644 --- a/vh-mail/layout/main.xml +++ b/vh-mail/layout/main.xml @@ -148,6 +148,9 @@ + + + @@ -170,4 +173,4 @@