Update templates for Lets Encrypt support

Author: Kristan Kenney

bin/v-add-letsencrypt-domain

@@ -83,11 +83,11 @@ fi
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Rework domain and alieses for mail.
+# Generate correct variables for mail domain SSL certificates
 if [ ! -z "$mail" ]; then
-    original_domain=$domain
-    aliases="webmail.$domain,autodiscover.$domain"
-    domain="mail.$domain"
+    root_domain=$domain
+    domain="mail.$root_domain"
+    aliases="$WEBMAIL_ALIAS.$root_domain,autodiscover.$root_domain"
 fi
 
 # Registering LetsEncrypt user account
@@ -163,12 +163,12 @@ for auth in $authz; do
         check_result $? "DNS _acme-challenge record wasn't created"
     else
         if [ "$WEB_SYSTEM" = 'nginx' ] || [ ! -z "$PROXY_SYSTEM" ]; then
-            if [ -z "$mail" ]; then
+            if [ ! -z "$mail" ]; then
+                conf="$HOMEDIR/$user/conf/mail/$root_domain/$PROXY_SYSTEM.conf_letsencrypt"
+                sconf="$HOMEDIR/$user/conf/mail/$root_domain/$PROXY_SYSTEM.ssl.conf_letsencrypt"
+            else
                 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/mail/$original_domain/$PROXY_SYSTEM.conf_letsencryptmail"
-                sconf="$HOMEDIR/$user/conf/mail/$original_domain/$PROXY_SYSTEM.ssl.conf_letsencryptmail"
             fi
 
             if [ ! -e "$conf" ]; then
@@ -295,9 +295,9 @@ if [ -z "$mail" ]; then
     update_object_value 'web' 'DOMAIN' "$domain" '$LETSENCRYPT' 'yes'
 else
     if [ -z "$LETSENCRYPT" ]; then
-        add_object_key "mail" 'DOMAIN' "$original_domain" 'LETSENCRYPT'
+        add_object_key "mail" 'DOMAIN' "$root_domain" 'LETSENCRYPT'
     fi
-    update_object_value 'mail' 'DOMAIN' "$original_domain" '$LETSENCRYPT' 'yes'
+    update_object_value 'mail' 'DOMAIN' "$root_domain" '$LETSENCRYPT' 'yes'
 fi
 
 #----------------------------------------------------------#

install/deb/templates/mail/apache2/default.stpl

@@ -46,4 +46,7 @@
         Order allow,deny
         Deny from all
     </Directory>
+
+    IncludeOptional %home%/%user%/conf/mail/%domain%/%web_system%.ssl.conf_*
+
 </VirtualHost>

install/deb/templates/mail/apache2/default.tpl

@@ -41,4 +41,7 @@
         Order allow,deny
         Deny from all
     </Directory>
+
+    IncludeOptional %home%/%user%/conf/mail/%domain%/%web_system%.conf_*
+
 </VirtualHost>

install/deb/templates/mail/nginx/default.stpl

@@ -30,6 +30,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
+    include %home%/%user%/conf/mail/%domain%/nginx.ssl.conf_*;
 }
 

install/deb/templates/mail/nginx/default.tpl

@@ -37,4 +37,6 @@ server {
     location ~ /\.git/  {return 404;}
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
+
+    include %home%/%user%/conf/mail/%domain%/nginx.conf_*;
 }