Browse Source

Fix removal of SSL certificates from data directory in function

Kristan Kenney 7 years ago
parent
commit
9dd3cd3129
1 changed files with 6 additions and 1 deletions
  1. 6 1
      func/domain.sh

+ 6 - 1
func/domain.sh

@@ -730,10 +730,15 @@ del_mail_ssl_config() {
 
 
     # Remove SSL certificates
     # Remove SSL certificates
     rm -f $HOMEDIR/$user/conf/mail/$domain/ssl/*
     rm -f $HOMEDIR/$user/conf/mail/$domain/ssl/*
-    rm -f $USER_DATA/ssl/mail.$domain.*
     rm -f /usr/local/hestia/ssl/mail/mail.$domain.*
     rm -f /usr/local/hestia/ssl/mail/mail.$domain.*
 }
 }
 
 
+# Delete generated certificates from user configuration data directory
+del_mail_ssl_certificates(){
+    rm -f $USER_DATA/ssl/mail.$domain.*
+    rm -f $HOMEDIR/$user/conf/mail/$domain/ssl/*
+}
+
 # Delete webmail support
 # Delete webmail support
 del_webmail_config() {
 del_webmail_config() {
     if [ ! -z "$WEB_SYSTEM" ]; then 
     if [ ! -z "$WEB_SYSTEM" ]; then