add maildb entry when domain entry is created
This commit is contained in:
@@ -105,6 +105,7 @@ function clear(callback) {
|
|||||||
child_process.exec.bind(null, cmd),
|
child_process.exec.bind(null, cmd),
|
||||||
require('./clientdb.js')._addDefaultClients,
|
require('./clientdb.js')._addDefaultClients,
|
||||||
require('./domaindb.js')._addDefaultDomain,
|
require('./domaindb.js')._addDefaultDomain,
|
||||||
|
require('./maildb.js')._addDefaultDomain,
|
||||||
require('./groupdb.js')._addDefaultGroups
|
require('./groupdb.js')._addDefaultGroups
|
||||||
], callback);
|
], callback);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,10 +10,13 @@ exports = module.exports = {
|
|||||||
|
|
||||||
TYPE_USER: 'user',
|
TYPE_USER: 'user',
|
||||||
TYPE_APP: 'app',
|
TYPE_APP: 'app',
|
||||||
TYPE_GROUP: 'group'
|
TYPE_GROUP: 'group',
|
||||||
|
|
||||||
|
_addDefaultDomain: addDefaultDomain
|
||||||
};
|
};
|
||||||
|
|
||||||
var assert = require('assert'),
|
var assert = require('assert'),
|
||||||
|
config = require('./config.js'),
|
||||||
database = require('./database.js'),
|
database = require('./database.js'),
|
||||||
DatabaseError = require('./databaseerror.js'),
|
DatabaseError = require('./databaseerror.js'),
|
||||||
safe = require('safetydance');
|
safe = require('safetydance');
|
||||||
@@ -107,3 +110,12 @@ function update(domain, data, callback) {
|
|||||||
callback(null);
|
callback(null);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function addDefaultDomain(callback) {
|
||||||
|
assert(config.fqdn(), 'no fqdn set in config, cannot continue');
|
||||||
|
|
||||||
|
add(config.fqdn(), function (error) {
|
||||||
|
if (error && error.reason !== DatabaseError.ALREADY_EXISTS) return callback(error);
|
||||||
|
callback();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ var async = require('async'),
|
|||||||
eventlog = require('../eventlog.js'),
|
eventlog = require('../eventlog.js'),
|
||||||
expect = require('expect.js'),
|
expect = require('expect.js'),
|
||||||
mail = require('../mail.js'),
|
mail = require('../mail.js'),
|
||||||
|
maildb = require('../maildb.js'),
|
||||||
mailer = require('../mailer.js'),
|
mailer = require('../mailer.js'),
|
||||||
paths = require('../paths.js'),
|
paths = require('../paths.js'),
|
||||||
safe = require('safetydance'),
|
safe = require('safetydance'),
|
||||||
@@ -67,7 +68,7 @@ describe('digest', function () {
|
|||||||
settings.initialize,
|
settings.initialize,
|
||||||
user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
|
user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
|
||||||
eventlog.add.bind(null, eventlog.ACTION_UPDATE, AUDIT_SOURCE, { boxUpdateInfo: { sourceTarballUrl: 'xx', version: '1.2.3', changelog: [ 'good stuff' ] } }),
|
eventlog.add.bind(null, eventlog.ACTION_UPDATE, AUDIT_SOURCE, { boxUpdateInfo: { sourceTarballUrl: 'xx', version: '1.2.3', changelog: [ 'good stuff' ] } }),
|
||||||
settingsdb.set.bind(null, mail.MAIL_CONFIG_KEY, JSON.stringify({ enabled: true })),
|
maildb.update.bind(null, DOMAIN_0.domain, { enabled: true }),
|
||||||
mailer._clearMailQueue
|
mailer._clearMailQueue
|
||||||
], done);
|
], done);
|
||||||
});
|
});
|
||||||
@@ -123,7 +124,7 @@ describe('digest', function () {
|
|||||||
it('sends mail for pending update to owner account email', function (done) {
|
it('sends mail for pending update to owner account email', function (done) {
|
||||||
updatechecker._setUpdateInfo({ box: null, apps: { 'appid': { manifest: { version: '1.2.5', changelog: 'noop\nreally' } } } });
|
updatechecker._setUpdateInfo({ box: null, apps: { 'appid': { manifest: { version: '1.2.5', changelog: 'noop\nreally' } } } });
|
||||||
|
|
||||||
settingsdb.set(mail.MAIL_CONFIG_KEY, JSON.stringify({ enabled: true }), function (error) {
|
maildb.update(DOMAIN_0.domain, { enabled: true }, function (error) {
|
||||||
if (error) return done(error);
|
if (error) return done(error);
|
||||||
|
|
||||||
digest.maybeSend(function (error) {
|
digest.maybeSend(function (error) {
|
||||||
|
|||||||
Reference in New Issue
Block a user