Migrate webtop-pecbridge configuration and handle empty AdminMail

NethServer · Sep 20, 2024 · d9abd07 · d9abd07
1 parent a3de551
commit d9abd07
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/root/usr/share/nethesis/nethserver-ns8-migration/apps/nethserver-webtop5/migrate b/root/usr/share/nethesis/nethserver-ns8-migration/apps/nethserver-webtop5/migrate
@@ -95,21 +95,21 @@ rsync "${RSYNC_ENDPOINT}"/terminate
 
 # Wait until the import-module task has completed
 ns8-action --attach wait "${IMPORT_TASK_ID}"
-
 # Repeat the configure-module if it fails because mail module is not found
 while ! ns8-action --attach "module/${MODULE_INSTANCE_ID}" configure-module "$(
     /sbin/e-smith/config printjson webtop |
     jq -c \
     --arg hostname "${WEBTOP_VHOST}" \
     --arg mail_domain "$(hostname -d)" \
     --arg mail_module "${MAIL_INSTANCE_ID}" \
+    --arg AdminMail "$(/sbin/e-smith/config getprop webtop-pecbridge AdminMail)" \
     '.props | {
         "hostname": $hostname,
         "mail_module": $mail_module,
         "mail_domain": $mail_domain,
         "timezone": .DefaultTimezone,
         "locale": .DefaultLocale,
-        "pecbridge_admin_mail": (.AdminMail // ""),
+        "pecbridge_admin_mail": $AdminMail,
         "webapp": {
             "debug": (.Debug == "true"),
             "min_memory": (.MinMemory | tonumber),