Browse Source

Fix issues with mail domains

Jaap Marcus 5 years ago
parent
commit
ba671484f5
2 changed files with 2 additions and 2 deletions
  1. 1 1
      bin/v-add-letsencrypt-domain
  2. 1 1
      bin/v-list-mail-domain-ssl

+ 1 - 1
bin/v-add-letsencrypt-domain

@@ -118,7 +118,7 @@ check_hestia_demo_mode
 if [ ! -z "$mail" ]; then
 if [ ! -z "$mail" ]; then
     root_domain=$domain
     root_domain=$domain
     domain="mail.$root_domain"
     domain="mail.$root_domain"
-    webmail=$(get_object_value "mail" "$domain" '$WEBMAIL');
+    webmail=$(get_object_value "mail" "DOMAIN" "$root_domain" '$WEBMAIL');
     if [ ! -z "$webmail" ]; then
     if [ ! -z "$webmail" ]; then
         aliases="$WEBMAIL_ALIAS.$root_domain"
         aliases="$WEBMAIL_ALIAS.$root_domain"
     fi
     fi

+ 1 - 1
bin/v-list-mail-domain-ssl

@@ -27,7 +27,7 @@ format_domain_idn
 # JSON list function
 # JSON list function
 json_list() {
 json_list() {
     echo '{'
     echo '{'
-    echo -e "\t\"$domain_idn\": {"
+    echo -e "\t\"$domain\": {"
     echo "        \"CRT\": \"$crt\","
     echo "        \"CRT\": \"$crt\","
     echo "        \"KEY\": \"$key\","
     echo "        \"KEY\": \"$key\","
     echo "        \"CA\": \"$ca\","
     echo "        \"CA\": \"$ca\","