jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

show warning when enabling email with cloudflare

Browse Source
This commit is contained in:
Girish Ramakrishnan
2019-12-31 10:33:09 -08:00
parent 1dca3c17a4
commit aaae8a84f6
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/email.html
View File

@@ -16,6 +16,11 @@
<div ng-show="selectedDomain.provider === 'noop' || selectedDomain.provider === 'manual'">
No DNS provider is setup. The DNS records listed in the Status tab have to be setup manually.<br/>
</div>
<div class="text-danger" ng-show="adminDomain.provider === 'cloudflare'">
Please verify that Cloudflare proxying for <code>{{ config.adminFqdn }}</code> is disabled and set to <code>DNS only</code>.
This is required because Cloudflare does not proxy email.<br/><br/>
</div>
<div ng-hide="selectedDomain.provider === 'noop' || selectedDomain.provider === 'manual'">
<p>
<label class="control-label">

2
src/views/email.js
View File

@@ -15,6 +15,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
$scope.domains = [];
$scope.users = [];
$scope.selectedDomain = null;
$scope.adminDomain = null;
$scope.expectedDnsRecords = {
mx: { },
@@ -696,6 +697,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
$scope.domains = domains;
$scope.selectedDomain = domains.find(function (d) { return d.domain === domain; });
$scope.adminDomain = domains.find(function (d) { return d.domain === $scope.config.adminDomain; });
if (!$scope.selectedDomain) {
$location.path('/email/' + domains[0].domain, false);