diff --git a/src/mail_templates/digest.ejs b/src/mail_templates/digest.ejs index a62f031dc..e2f0ec37c 100644 --- a/src/mail_templates/digest.ejs +++ b/src/mail_templates/digest.ejs @@ -2,15 +2,20 @@ Dear <%= cloudronName %> Admin, -This is your weekly summary of activities on your Cloudron. +This is the weekly summary of activities on your Cloudron. + <% if (info.pendingBoxUpdate) { %> -Pending box update to version <%- info.pendingBoxUpdate.version %>: +New Cloudron version <%- info.pendingBoxUpdate.version %> is available. Please update +at the earliest. + +Changelog for this version: <% for (var i = 0; i < info.pendingBoxUpdate.changelog.length; i++) { %> * <%- info.pendingBoxUpdate.changelog[i] %> <% } %> <% } %> + <% if (info.pendingAppUpdates.length) { %> -Pending app updates: +One or more apps updates are available: <% for (var i = 0; i < info.pendingAppUpdates.length; i++) { %> - <%= info.pendingAppUpdates[i].manifest.title %> (to version <%= info.pendingAppUpdates[i].manifest.version %>): <% for (var j = 0; j < info.pendingAppUpdates[i].manifest.changelog.split('\n').length; j++) { %> @@ -18,8 +23,9 @@ Pending app updates: <% } %> <% } %> <% } %> + <% if (info.finishedBoxUpdates.length) { %> -Your Cloudron received <%= info.finishedBoxUpdates.length %> system updates. +Cloudron was updated with the following releases: <% for (var i = 0; i < info.finishedBoxUpdates.length; i++) { %> - Version <%= info.finishedBoxUpdates[i].boxUpdateInfo.version %> <% for (var j = 0; j < info.finishedBoxUpdates[i].boxUpdateInfo.changelog.length; j++) { %> @@ -29,7 +35,7 @@ Your Cloudron received <%= info.finishedBoxUpdates.length %> system updates. <% } %> <% if (info.finishedAppUpdates.length) { %> -Your Cloudron updated the following apps: +The following apps were updated: <% for (var i = 0; i < info.finishedAppUpdates.length; i++) { %> - <%= info.finishedAppUpdates[i].toManifest.title %> (to version <%= info.finishedAppUpdates[i].toManifest.version %>) <% for (var j = 0; j < info.finishedAppUpdates[i].toManifest.changelog.split('\n').length; j++) { %> @@ -38,8 +44,9 @@ Your Cloudron updated the following apps: <% } %> <% } %> -Thank you, -your Cloudron +Powered by https://cloudron.io + +Sent at: <%= new Date().toUTCString() %> <% } else { %> diff --git a/src/mailer.js b/src/mailer.js index 69b8ccc68..823c2f908 100644 --- a/src/mailer.js +++ b/src/mailer.js @@ -419,7 +419,7 @@ function sendDigest(info) { var mailOptions = { from: mailConfig().from, to: adminEmails.join(', '), - subject: util.format('[%s] Weekly event digest', config.fqdn()), + subject: util.format('[%s] Cloudron - Weekly activity digest', config.fqdn()), text: render('digest.ejs', { fqdn: config.fqdn(), webadminUrl: config.adminOrigin(), cloudronName: cloudronName, info: info, format: 'text' }) };