Explorar el Código

Add SSL/Let's Encrypt flags to existing mail domains on upgrade

Kristan Kenney hace 7 años
padre
commit
fdbe522060
Se han modificado 1 ficheros con 8 adiciones y 0 borrados
  1. 8 0
      func/rebuild.sh

+ 8 - 0
func/rebuild.sh

@@ -549,6 +549,14 @@ rebuild_mail_domain_conf() {
         chown $user:mail $HOMEDIR/$user/mail/$domain_idn
         chown $user:mail $HOMEDIR/$user/mail/$domain_idn
     fi
     fi
 
 
+    # Add missing SSL configuration flags to existing domains
+    # for per-domain SSL migration
+
+    sslcheck=$(grep "DOMAIN='$domain'" $USER_DATA/mail.conf | grep SSL)
+    if [ -z "$sslcheck" ]; then
+        sed -i "s|$domain'|$domain' SSL='no' LETSENCRYPT='no'|g" $USER_DATA/mail.conf
+    fi 
+    
     # Remove and recreate SSL configuration
     # Remove and recreate SSL configuration
     if [ -f "$HOMEDIR/$user/conf/mail/$domain/ssl/$domain.crt" ]; then
     if [ -f "$HOMEDIR/$user/conf/mail/$domain/ssl/$domain.crt" ]; then
         del_mail_ssl_config
         del_mail_ssl_config