Merge pull request #21 from NethServer/fixRestore

Fix backup and clone action NethServer/dev#6945
NethServer · Jun 10, 2024 · 34957e5 · 34957e5
2 parents d79a903 + b9003d5
commit 34957e5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git 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"],

diff --git 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",

diff --git 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!")