From 91c931b53cdf3b3c2fc6aadbc1fd98c77c5db0ae Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Wed, 11 Jan 2017 03:45:33 +0100
Subject: [PATCH] Revert "Remove broken external domain validation"

This reverts commit 9b1b833facc2e463ae7eb7f66158a5c75ef4e1d8.
---
 webadmin/src/views/apps.html | 2 +-
 webadmin/src/views/apps.js   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index b0d69d9fe..081bd46e7 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -49,7 +49,7 @@
                             </div>
                         </div>
 
-                        <p class="text-center" ng-show="appConfigure.usingAltDomain && appConfigure.location">
+                        <p class="text-center" ng-show="appConfigure.usingAltDomain && appConfigure.location && appConfigure.isAltDomainValid()">
                             Add a CNAME record for {{ appConfigure.location }} to {{ appConfigure.app.fqdn }}
                             <br>
                         </p>
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js
index ba5e9c8ce..abe2f8ca7 100644
--- a/webadmin/src/views/apps.js
+++ b/webadmin/src/views/apps.js
@@ -38,6 +38,11 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         isAccessRestrictionValid: function () {
             var tmp = $scope.appConfigure.accessRestriction;
             return !!(tmp.users.length || tmp.groups.length);
+        },
+
+        isAltDomainValid: function () {
+            if (!$scope.appConfigure.usingAltDomain) return true;
+            return /.+\..+\..+/.test($scope.appConfigure.location); // 2 dots
         }
     };