Add 1.8.5 changes

Even though app.manifest variable is updated by updatedApp, the
setupAddons is called with the _old_ value because it is a bind()

CHANGES

@@ -1121,3 +1121,24 @@
 * Show documentation URL in the app info dialog
 * Update Lets Encrypt agrement URL (https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf)
 
+[1.8.2]
+* Update node modules
+* Allow a restore operation if app is already restoring
+* Remove pre-install bundle support since it was hardly used
+* Make the test email mail address configurable
+* Allow admins to access all apps
+* Send feedback via appstore API (instead of email)
+* Show documentation URL in the app info dialog
+* Update Lets Encrypt agrement URL (https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf)
+
+[1.8.3]
+* Ensure domain database record exists
+
+[1.8.4]
+* Fix issue where internal email was not delivered when email relay is enabled
+* Fix display of DNS records when email relay is enabled
+
+[1.8.5]
+* Fix issues where unused addons were not cleaned on an app update causing uninstall to fail
+* Change UI text from 'Waiting' to 'Pending'
+

src/apptask.js

@@ -645,7 +645,7 @@ function update(app, callback) {
         downloadIcon.bind(null, app),
 
         updateApp.bind(null, app, { installationProgress: '70, Updating addons' }),
-        addons.setupAddons.bind(null, app, app.manifest.addons),
+        addons.setupAddons.bind(null, app, app.updateConfig.manifest.addons),
 
         updateApp.bind(null, app, { installationProgress: '80, Creating container' }),
         createContainer.bind(null, app),

src/cloudron.js

@@ -52,6 +52,7 @@ var appdb = require('./appdb.js'),
     safe = require('safetydance'),
     settings = require('./settings.js'),
     SettingsError = settings.SettingsError,
+    settingsdb = require('./settingsdb.js'),
     shell = require('./shell.js'),
     spawn = require('child_process').spawn,
     split = require('split'),
@@ -183,12 +184,18 @@ function dnsSetup(dnsConfig, domain, zoneName, callback) {
         config.setFqdn(domain); // set fqdn only after dns config is valid, otherwise cannot re-setup if we failed
         config.setZoneName(zoneName);
 
-        async.series([ // do not block
-            onDomainConfigured,
-            configureWebadmin
-        ], NOOP_CALLBACK);
+        // upsert the temporary domain record in settings db
+        // This can be removed after this release
+        settingsdb.set('domain', JSON.stringify({ fqdn: domain, zoneName: zoneName }), function (error) {
+            if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
 
-        callback();
+            async.series([ // do not block
+                onDomainConfigured,
+                configureWebadmin
+            ], NOOP_CALLBACK);
+
+            callback();
+        });
     });
 }
 

src/infra_version.js

@@ -18,7 +18,7 @@ exports = module.exports = {
         'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:0.17.1' },
         'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:0.13.0' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:0.11.0' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:0.39.0' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:0.39.1' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:0.12.0' }
     }
 };

webadmin/src/js/index.js

@@ -158,7 +158,7 @@ app.filter('installationStateLabel', function() {
     }
 
     return function(app) {
-        var waiting = app.progress === 0 ? ' (Waiting)' : '';
+        var waiting = app.progress === 0 ? ' (Pending)' : '';
 
         switch (app.installationState) {
         case ISTATES.PENDING_INSTALL:

webadmin/src/views/email.html

@@ -195,12 +195,13 @@
     </div>
   </div>
 
-  <div class="text-left" ng-show="dnsConfig.provider && dnsConfig.provider !== 'caas'">
+  <div class="text-left" ng-show="dnsConfig.provider && dnsConfig.provider !== 'caas' && currentRelay.provider === 'cloudron-smtp'">
     <h3>DNS Records</h3>
   </div>
 
-  <div class="card" style="margin-bottom: 15px;" ng-show="dnsConfig.provider && dnsConfig.provider !== 'caas'">
+  <div class="card" style="margin-bottom: 15px;" ng-show="dnsConfig.provider && dnsConfig.provider !== 'caas' && currentRelay.provider === 'cloudron-smtp'">
     <div class="row">
+
       <div class="col-md-12">
         Set the following DNS records to guarantee email delivery:
 
@@ -225,8 +226,10 @@
             </div>
           </div>
         </div>
+
       </div>
     </div>
+
   </div>
 
   <div class="text-left" ng-show="dnsConfig.provider && dnsConfig.provider !== 'caas'">
@@ -241,12 +244,12 @@
           <div class="col-xs-12">
             <p class="text-muted">
               <i ng-hide="email.refreshBusy" ng-class="relay.status ? 'fa fa-check-circle text-success' : 'fa fa-exclamation-triangle text-danger'"></i> &nbsp;
-              <a href="" data-toggle="collapse" data-parent="#accordion" data-target="#collapse_dns_port">
+              <a href="" data-toggle="collapse" data-parent="#accordion" data-target="#collapse_outbound_smtp">
                 Outbound SMTP
               </a>
               <button class="btn btn-xs btn-default" ng-click="email.refresh()" ng-disabled="email.refreshBusy" ng-show="!relay.status"><i class="fa fa-refresh" ng-class="{ 'fa-pulse': email.refreshBusy }"></i></button>
             </p>
-            <div id="collapse_dns_port" class="panel-collapse collapse">
+            <div id="collapse_outbound_smtp" class="panel-collapse collapse">
               <div class="panel-body">
                 <p><b> {{ relay.value }} </b> </p>
               </div>
@@ -254,7 +257,7 @@
           </div>
         </div>
 
-        <div class="row">
+        <div class="row" ng-show="currentRelay.provider === 'cloudron-smtp'">
           <div class="col-xs-12">
             <p class="text-muted">
               <i ng-hide="email.refreshBusy" ng-class="rbl.status ? 'fa fa-check-circle text-success' : 'fa fa-exclamation-triangle text-danger'"></i> &nbsp;
@@ -274,8 +277,6 @@
           </div>
         </div>
 
-        <br/>
-
         <div class="row">
           <div class="col-xs-12">
             <button class="btn btn-primary pull-left" ng-click="testEmail.show()">Send Test Email</button>

webadmin/src/views/email.js

@@ -7,6 +7,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
     $scope.user = Client.getUserInfo();
     $scope.config = Client.getConfig();
     $scope.dnsConfig = {};
+    $scope.currentRelay = {};
     $scope.relay = {};
     $scope.rbl = null;
     $scope.expectedDnsRecords = {
@@ -87,6 +88,8 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         refresh: function () {
             $scope.email.refreshBusy = true;
 
+            collapseDnsRecords();
+
             showExpectedDnsRecords(function (error) {
                 if (error) console.error(error);
 
@@ -156,10 +159,16 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             }
 
             Client.setMailRelay(data, function (error) {
-                if (error) $scope.mailRelay.error = error.message;
-                else $scope.mailRelay.success = true;
-
                 $scope.mailRelay.busy = false;
+
+                if (error) {
+                    $scope.mailRelay.error = error.message;
+                    return;
+                }
+
+                $scope.currentRelay = data;
+                $scope.mailRelay.success = true;
+                $scope.email.refresh();
             });
         }
     };
@@ -221,6 +230,8 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             $scope.mailRelay.relay.password = '';
             $scope.mailRelay.relay.serverApiToken = '';
 
+            $scope.currentRelay = relay;
+
             if (relay.provider === 'postmark-smtp') {
                 $scope.mailRelay.relay.serverApiToken = relay.username;
             } else if (relay.provider === 'sendgrid-smtp') {
@@ -247,6 +258,16 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         });
     }
 
+    function collapseDnsRecords() {
+        $scope.expectedDnsRecordsTypes.forEach(function (record) {
+            var type = record.value;
+            $('#collapse_dns_' + type).collapse('hide');
+        });
+
+        $('#collapse_outbound_smtp').collapse('hide');
+        $('#collapse_rbl').collapse('hide');
+    }
+
     function showExpectedDnsRecords(callback) {
         callback = callback || function (error) { if (error) console.error(error); };
 
@@ -257,16 +278,21 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             $scope.rbl = result.rbl;
 
             // open the record details if they are not correct
-            for (var type in $scope.expectedDnsRecords) {
-                $scope.expectedDnsRecords[type] = result.dns[type];
+            $scope.expectedDnsRecordsTypes.forEach(function (record) {
+                var type = record.value;
+                $scope.expectedDnsRecords[type] = result.dns[type] || {};
 
                 if (!$scope.expectedDnsRecords[type].status) {
                     $('#collapse_dns_' + type).collapse('show');
                 }
-            }
+            });
 
             if (!$scope.relay.status) {
-                $('#collapse_dns_port').collapse('show');
+                $('#collapse_outbound_smtp').collapse('show');
+            }
+
+            if (!$scope.rbl.status) {
+                $('#collapse_rbl').collapse('show');
             }
 
             callback(null);