diff --git a/src/appstore.js b/src/appstore.js index 22fd0076e..0b616dfc4 100644 --- a/src/appstore.js +++ b/src/appstore.js @@ -166,7 +166,8 @@ function sendAliveStatus(data, callback) { catchAllCount: mailDomains.filter(function (d) { return d.catchAll.length !== 0; }).length, relayProviders: Array.from(new Set(mailDomains.map(function (d) { return d.relay.provider; }))) }, - autoupdatePattern: result[settings.AUTOUPDATE_PATTERN_KEY], + appAutoupdatePattern: result[settings.APP_AUTOUPDATE_PATTERN_KEY], + boxAutoupdatePattern: result[settings.BOX_AUTOUPDATE_PATTERN_KEY], timeZone: result[settings.TIME_ZONE_KEY], }; diff --git a/src/test/updatechecker-test.js b/src/test/updatechecker-test.js index 3142b6586..82fcfa0d1 100644 --- a/src/test/updatechecker-test.js +++ b/src/test/updatechecker-test.js @@ -78,7 +78,7 @@ describe('updatechecker - box - manual (email)', function () { domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate, DOMAIN_0.tlsConfig), mail.add.bind(null, DOMAIN_0.domain), user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE), - settings.setAutoupdatePattern.bind(null, constants.AUTOUPDATE_PATTERN_NEVER), + settings.setBoxAutoupdatePattern.bind(null, constants.AUTOUPDATE_PATTERN_NEVER), settingsdb.set.bind(null, settings.APPSTORE_CONFIG_KEY, JSON.stringify({ userId: 'uid', cloudronId: 'cid', token: 'token' })), mailer._clearMailQueue ], done); @@ -296,7 +296,7 @@ describe('updatechecker - app - manual (email)', function () { mailer._clearMailQueue, appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0), user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE), - settings.setAutoupdatePattern.bind(null, constants.AUTOUPDATE_PATTERN_NEVER), + settings.setAppAutoupdatePattern.bind(null, constants.AUTOUPDATE_PATTERN_NEVER), settingsdb.set.bind(null, settings.APPSTORE_CONFIG_KEY, JSON.stringify({ userId: 'uid', cloudronId: 'cid', token: 'token' })) ], done); }); @@ -412,6 +412,7 @@ describe('updatechecker - app - automatic (no email)', function () { mailer._clearMailQueue, appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0), user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE), + settings.setAppAutoupdatePattern.bind(null, '00 00 1,3,5,23 * * *'), settingsdb.set.bind(null, settings.APPSTORE_CONFIG_KEY, JSON.stringify({ userId: 'uid', cloudronId: 'cid', token: 'token' })) ], done); }); @@ -477,6 +478,7 @@ describe('updatechecker - app - automatic free (email)', function () { mailer._clearMailQueue, appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0), user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE), + settings.setAppAutoupdatePattern.bind(null, '00 00 1,3,5,23 * * *'), settingsdb.set.bind(null, settings.APPSTORE_CONFIG_KEY, JSON.stringify({ userId: 'uid', cloudronId: 'cid', token: 'token' })) ], done); }); diff --git a/src/updatechecker.js b/src/updatechecker.js index 3439c6560..61dcc960a 100644 --- a/src/updatechecker.js +++ b/src/updatechecker.js @@ -168,7 +168,7 @@ function checkBoxUpdates(callback) { } // only send notifications if update pattern is 'never' - settings.getAppAutoupdatePattern(function (error, result) { + settings.getBoxAutoupdatePattern(function (error, result) { if (error) debug(error); else if (result === constants.AUTOUPDATE_PATTERN_NEVER) mailer.boxUpdateAvailable(true /* hasSubscription */, updateInfo.version, updateInfo.changelog);