Do not add www alias to subdomains by default

Author: ScIT-Raphael

bin/v-add-web-domain

@@ -114,7 +114,13 @@ if [ "$aliases" = 'none' ]; then
 else
     ALIAS="www.$domain"
     if [ -z "$aliases" ]; then
-        ALIAS="www.$domain"
+        # Check and skip www alias for subdomains.
+        IFS='.' read -r -a domain_elements <<< "$domain"
+        if [ "${#domain_elements[@]}" -gt 2 ]; then
+            ALIAS=""
+        else
+            ALIAS="www.$domain"
+        fi
     else
         ALIAS="$aliases"
     fi

web/js/pages/add_web.js

@@ -174,7 +174,11 @@ App.Listeners.WEB.keypress_domain_name();
 $(function() {
     $('#v_domain').change(function() {
         var prefix = 'www.';
-        document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value;
+        if (((document.getElementById('v_domain').value).split(".")).length > 2) {
+            document.getElementById('v_aliases').value = "";
+        } else {
+            document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value;
+        }
     });
     App.Actions.WEB.toggle_letsencrypt($('input[name=v_letsencrypt]'))