From b32102f52132e6b3baae4f27b4bc6455a396c7fa Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Mon, 10 Jun 2024 09:04:18 +0200 Subject: [PATCH 1/3] chore: Remove obsolete TRAEFIK_HTTP2HTTPS environment variable --- imageroot/actions/restore-module/06copyenv | 1 - 1 file changed, 1 deletion(-) diff --git a/imageroot/actions/restore-module/06copyenv b/imageroot/actions/restore-module/06copyenv index a88979e..80d5017 100755 --- a/imageroot/actions/restore-module/06copyenv +++ b/imageroot/actions/restore-module/06copyenv @@ -45,7 +45,6 @@ for evar in [ "SOGOMAXIMUMSYNCWINDOWSIZE", "SXVMEMLIMIT", "TRAEFIK_HOST", -"TRAEFIK_HTTP2HTTPS", "TRAEFIK_LETS_ENCRYPT", "TRASHFOLDER", "WOWATCHDOGREQUESTTIMEOUT", From cd097a570ee4ca9ecccbeb20b6bd28d715e3c8f6 Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Mon, 10 Jun 2024 09:32:11 +0200 Subject: [PATCH 2/3] Refactor configure-module action to use boolean values for lets_encrypt, auxiliary_account, activesync, and dav --- imageroot/actions/restore-module/50call-configure-module | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/imageroot/actions/restore-module/50call-configure-module b/imageroot/actions/restore-module/50call-configure-module index 33749fb..c519b31 100755 --- a/imageroot/actions/restore-module/50call-configure-module +++ b/imageroot/actions/restore-module/50call-configure-module @@ -14,16 +14,15 @@ request = json.load(sys.stdin) renv = request['environment'] configure_retval = agent.tasks.run(agent_id=os.environ['AGENT_ID'], action='configure-module', data={ - "ldap_domain": renv["LDAP_DOMAIN"], "admin_users": renv["ADMIN_USERS"], "mail_server": renv["MAIL_SERVER"], "mail_domain": renv["MAIL_DOMAIN"], - "lets_encrypt": renv["TRAEFIK_LETS_ENCRYPT"], + "lets_encrypt": renv["TRAEFIK_LETS_ENCRYPT"] == 'True', "host": renv["TRAEFIK_HOST"], "workers_count": renv["WOWORKERSCOUNT"], - "auxiliary_account": renv["AUXILIARYACCOUNT"], - "activesync": renv["ACTIVESYNC"], - "dav": renv["DAV"], + "auxiliary_account": renv["AUXILIARYACCOUNT"] == 'True', + "activesync": renv["ACTIVESYNC"] == 'True', + "dav": renv["DAV"] == 'True', }) agent.assert_exp(configure_retval['exit_code'] == 0, "The configure-module subtask failed!") From b9003d572df1fb52d1ed0410033bbafde141bba4 Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Mon, 10 Jun 2024 09:32:57 +0200 Subject: [PATCH 3/3] Refactor remove ldap_domain for clone action --- imageroot/actions/clone-module/50call-configure-module | 1 - 1 file changed, 1 deletion(-) diff --git a/imageroot/actions/clone-module/50call-configure-module b/imageroot/actions/clone-module/50call-configure-module index ef40830..f366496 100755 --- a/imageroot/actions/clone-module/50call-configure-module +++ b/imageroot/actions/clone-module/50call-configure-module @@ -11,7 +11,6 @@ import agent import os configure_retval = agent.tasks.run(agent_id=os.environ['AGENT_ID'], action='configure-module', data={ - "ldap_domain": os.environ["LDAP_DOMAIN"], "admin_users": os.environ["ADMIN_USERS"], "mail_server": os.environ["MAIL_SERVER"], "mail_domain": os.environ["MAIL_DOMAIN"],