Rework let's encrypt for mail ssl.

Author: ScIT-Raphael

bin/v-add-letsencrypt-domain

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: check letsencrypt domain
-# options: USER DOMAIN [ALIASES]
+# options: USER DOMAIN [ALIASES] [MAIL]
 #
 # The function check and validates domain with Let's Encrypt
 
@@ -13,6 +13,7 @@
 user=$1
 domain=$2
 aliases=$3
+mail=$3
 
 # LE API
 LE_API='https://acme-v02.api.letsencrypt.org'
@@ -54,26 +55,41 @@ query_le_v2() {
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '2' "$#" 'USER DOMAIN [ALIASES]'
+check_args '2' "$#" 'USER DOMAIN [ALIASES] [MAIL]'
 is_format_valid 'user' 'domain' 'aliases'
-is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
-is_object_valid 'web' 'DOMAIN' "$domain"
-is_object_unsuspended 'web' 'DOMAIN' "$domain"
-get_domain_values 'web'
-for alias in $(echo "$aliases" |tr ',' '\n' |sort -u); do
-    check_alias="$(echo $ALIAS |tr ',' '\n' |grep ^$alias$)"
-    if [ -z "$check_alias" ]; then
-        check_result $E_NOTEXIST "domain alias $alias doesn't exist"
-    fi
-done
+if [ -z "$mail" ]; then
+    is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
+    is_object_valid 'web' 'DOMAIN' "$domain"
+    is_object_unsuspended 'web' 'DOMAIN' "$domain"
+    get_domain_values 'web'
+    for alias in $(echo "$aliases" |tr ',' '\n' |sort -u); do
+        check_alias="$(echo $ALIAS |tr ',' '\n' |grep ^$alias$)"
+        if [ -z "$check_alias" ]; then
+            check_result $E_NOTEXIST "domain alias $alias doesn't exist"
+        fi
+    done
+else
+    is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
+    is_object_valid 'mail' 'DOMAIN' "$domain"
+    is_object_unsuspended 'mail' 'DOMAIN' "$domain"
+    is_object_value_empty 'mail' 'DOMAIN' "$domain" '$SSL'
+fi
+
 
 
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
 
+# Rework domain and alieses for mail.
+if [ ! -z "$mail" ]; then
+    original_domain="mail.$domain"
+    domain="mail.$domain"
+    aliases="webmail.$domain,autodiscover.$domain"
+fi
+
 # Registering LetsEncrypt user account
 $BIN/v-add-letsencrypt-user $user
 if [ "$?" -ne 0  ]; then
@@ -147,8 +163,8 @@ for auth in $authz; do
         check_result $? "DNS _acme-challenge record wasn't created"
     else
         if [ "$WEB_SYSTEM" = 'nginx' ] || [ ! -z "$PROXY_SYSTEM" ]; then
-            conf="$HOMEDIR/$user/conf/web/nginx.$domain.conf_letsencrypt"
-            sconf="$HOMEDIR/$user/conf/web/snginx.$domain.conf_letsencrypt"
+            conf="$HOMEDIR/$user/conf/web/$domain/nginx.conf_letsencrypt"
+            sconf="$HOMEDIR/$user/conf/web/$domain/nginx.ssl.conf_letsencrypt"
             if [ ! -e "$conf" ]; then
                 echo 'location ~ "^/\.well-known/acme-challenge/(.*)$" {' \
                     > $conf
@@ -237,9 +253,15 @@ if [[ $(head -n 1 $ssl_dir/$domain.ca) = "-----END CERTIFICATE-----" ]]; then
 fi
 
 # Adding SSL
-ssl_home=$(search_objects 'web' 'LETSENCRYPT' 'yes' 'SSL_HOME')
-$BIN/v-delete-web-domain-ssl $user $domain > /dev/null 2>&1
-$BIN/v-add-web-domain-ssl $user $domain $ssl_dir $ssl_home
+if [ -z "$mail" ]; then
+    ssl_home=$(search_objects 'web' 'LETSENCRYPT' 'yes' 'SSL_HOME')
+    $BIN/v-delete-web-domain-ssl $user $domain > /dev/null 2>&1
+    $BIN/v-add-web-domain-ssl $user $domain $ssl_dir $ssl_home
+else
+    $BIN/v-delete-mail-domain-ssl $user $domain >/dev/null 2>&1
+    $BIN/v-add-mail-domain-ssl $user $domain $ssl_dir
+fi
+
 if [ "$?" -ne '0' ]; then
     touch $HESTIA/data/queue/letsencrypt.pipe
     sed -i "/ $domain /d" $HESTIA/data/queue/letsencrypt.pipe
@@ -256,11 +278,17 @@ if [ -z "$(grep v-update-lets $HESTIA/data/users/admin/cron.conf)" ]; then
 fi
 
 # Updating letsencrypt key
-if [ -z "$LETSENCRYPT" ]; then
-    add_object_key "web" 'DOMAIN' "$domain" 'LETSENCRYPT' 'FTP_USER'
+if [ -z "$mail" ]; then
+    if [ -z "$LETSENCRYPT" ]; then
+        add_object_key "web" 'DOMAIN' "$domain" 'LETSENCRYPT' 'FTP_USER'
+    fi
+    update_object_value 'web' 'DOMAIN' "$domain" '$LETSENCRYPT' 'yes'
+else
+    if [ -z "$LETSENCRYPT" ]; then
+        add_object_key "mail" 'DOMAIN' "$original_domain" 'LETSENCRYPT'
+    fi
+    update_object_value 'mail' 'DOMAIN' "$original_domain" '$LETSENCRYPT' 'yes'
 fi
-update_object_value 'web' 'DOMAIN' "$domain" '$LETSENCRYPT' 'yes'
-
 
 #----------------------------------------------------------#
 #                        Hestia                            #