Merge branch 'mail-file-fixes' into mail-ssl

Author: Kristan Kenney

bin/v-add-letsencrypt-domain

@@ -13,7 +13,7 @@
 user=$1
 domain=$2
 aliases=$3
-mail=$3
+mail=$4
 
 # LE API
 LE_API='https://acme-v02.api.letsencrypt.org'
@@ -86,7 +86,7 @@ fi
 # Rework domain and alieses for mail.
 if [ ! -z "$mail" ]; then
     original_domain=$domain
-    aliases="webmail.$domain,autodiscover.$domain"
+    aliases="webmail.$original_domain,autodiscover.$original_domain"
     domain="mail.$domain"
 fi
 
@@ -163,8 +163,14 @@ 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/$domain/$PROXY_SYSTEM.conf_letsencrypt"
-            sconf="$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf_letsencrypt"
+            if [ -z "$mail" ]; then
+                conf="$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf_letsencrypt"
+                sconf="$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.ssl.conf_letsencrypt"
+            else
+                conf="$HOMEDIR/$user/conf/web/$original_domain/$PROXY_SYSTEM.conf_letsencryptmail"
+                sconf="$HOMEDIR/$user/conf/web/$original_domain/$PROXY_SYSTEM.ssl.conf_letsencryptmail"
+            fi
+
             if [ ! -e "$conf" ]; then
                 echo 'location ~ "^/\.well-known/acme-challenge/(.*)$" {' \
                     > $conf

func/domain.sh

@@ -629,6 +629,10 @@ add_mail_ssl_config() {
 
 # Delete SSL support for mail domain
 del_mail_ssl_config() {
+    
+    # Remove old mail certificates
+    rm -f $HOMEDIR/$user/conf/mail/$domain/ssl/*
+
     # Remove dovecot configuration
     rm -f /etc/dovecot/conf.d/domains/mail.$domain.conf
 

func/rebuild.sh

@@ -498,6 +498,7 @@ rebuild_mail_domain_conf() {
 
         # Remove and recreate SSL configuration
         if [ "$SSL" = 'yes' ]; then
+            del_mail_ssl_config
             add_mail_ssl_config
 
             # Update counters

install/upgrade/0.9.8-29.sh

@@ -188,11 +188,10 @@ if [ -f /etc/dovecot/dovecot.conf ]; then
 fi
 
 # Update Roundcube webmail configuration
-if [ -f /etc/apache2/conf.d/roundcube.conf ]; then
+if [ "$WEB_SYSTEM" = 'apache2' ]; then
     echo "(*) Updating Roundcube global subdomain configuration for apache2..."
     cp -f $HESTIA/install/deb/roundcube/apache.conf /etc/apache2/conf.d/roundcube.conf
 fi
-
 if [ ! -z "$PROXY_SYSTEM" ]; then
     echo "(*) Updating Roundcube global subdomain configuration for nginx..."
     if [ -f /etc/nginx/conf.d/webmail.inc ]; then