Merge pull request #37 from NethServer/fixRecovery

Module restoration is broken due to bad validation NethServer/dev#6844
NethServer · Feb 9, 2024 · aff69f4 · aff69f4
2 parents 33326be + 3e57494
commit aff69f4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 43 deletions.
diff --git a/imageroot/actions/restore-module/06copyenv b/imageroot/actions/restore-module/06copyenv
diff --git a/imageroot/actions/restore-module/50call-configure-module b/imageroot/actions/restore-module/50call-configure-module
@@ -16,17 +16,17 @@ renv = request['environment']
 configure_retval = agent.tasks.run(agent_id=os.environ['AGENT_ID'], action='configure-module', data={
     "ldap_domain": renv["EJABBERD_LDAP_DOMAIN"],
     "adminsList": renv["EJABBERD_ADMIN_LIST"],
-    "s2s": renv["EJABBERD_S2S"],
-    "http_upload": renv["EJABBERD_HTTP_UPLOAD"],
+    "s2s": renv["EJABBERD_S2S"] == "True",
+    "http_upload": renv["EJABBERD_HTTP_UPLOAD"] == "True",
     "hostname": renv["EJABBERD_HOSTNAME"],
-    "mod_mam_status": renv["EJABBERD_MOD_MAM_STATUS"],
-    "shaper_normal": renv["EJABBERD_SHAPER_NORMAL"],
-    "shaper_fast": renv["EJABBERD_SHAPER_FAST"],
-    "mod_http_upload_unlimited": renv["EJABBERD_MOD_HTTP_UPLOAD_UNLIMITED"],
-    "purge_httpd_upload_interval": renv["EJABBERD_PURGE_HTTPD_UPLOAD_INTERVAL"],
-    "purge_mnesia_unlimited": renv["EJABBERD_PURGE_MNESIA_UNLIMITED"],
-    "purge_mnesia_interval": renv["EJABBERD_PURGE_MNESIA_INTERVAL"],
-    "lets_encrypt": renv["TRAEFIK_LETS_ENCRYPT"],
-    "webadmin": renv["EJABBERD_WEBADMIN"]
+    "mod_mam_status": renv["EJABBERD_MOD_MAM_STATUS"] == "True",
+    "shaper_normal": int(renv["EJABBERD_SHAPER_NORMAL"]),
+    "shaper_fast": int(renv["EJABBERD_SHAPER_FAST"]),
+    "mod_http_upload_unlimited": renv["EJABBERD_MOD_HTTP_UPLOAD_UNLIMITED"] == "True",
+    "purge_httpd_upload_interval": int(renv["EJABBERD_PURGE_HTTPD_UPLOAD_INTERVAL"]),
+    "purge_mnesia_unlimited": renv["EJABBERD_PURGE_MNESIA_UNLIMITED"] == "True",
+    "purge_mnesia_interval": int(renv["EJABBERD_PURGE_MNESIA_INTERVAL"]),
+    "lets_encrypt": renv["TRAEFIK_LETS_ENCRYPT"] == "True",
+    "webadmin": renv["EJABBERD_WEBADMIN"] == "True",
 })
 agent.assert_exp(configure_retval['exit_code'] == 0, "The configure-module subtask failed!")
diff --git a/imageroot/etc /state-include.conf → imageroot/etc/state-include.conf b/imageroot/etc /state-include.conf → imageroot/etc/state-include.conf
@@ -5,3 +5,4 @@
 #
 state/ejabberd.backup
 volumes/upload
+state/certificates