Merge branch 'main' of github.com:sisco0/cryptpad into task-migration-fix

pull/1/head
ansuz 4 years ago
commit 561cf96c72

@ -46,7 +46,7 @@ module.exports = {
* cryptpad/docs/example.nginx.conf (see the $main_domain variable) * cryptpad/docs/example.nginx.conf (see the $main_domain variable)
* *
*/ */
httpUnsafeOrigin: 'http://localhost:3000/', httpUnsafeOrigin: 'http://127.0.0.1:3000/ http://localhost:3000',
/* httpSafeOrigin is the URL that is used for the 'sandbox' described above. /* httpSafeOrigin is the URL that is used for the 'sandbox' described above.
* If you're testing or developing with CryptPad on your local machine then * If you're testing or developing with CryptPad on your local machine then

@ -8,14 +8,14 @@ var config = require("../../lib/load-config");
// but the API requires it, and I don't feel like changing that // but the API requires it, and I don't feel like changing that
// --ansuz // --ansuz
var FileStorage = require("../../lib/storage/file"); var FileStorage = require("../../lib/storage/file");
var tasks; var tasks;
nThen(function (w) { nThen(function (w) {
Logger.create(config, w(function (_log) { Logger.create(config, w(function (_log) {
config.log = _log; config.log = _log;
})); }));
}).nThen(function (w) { }).nThen(function (w) {
FileStorage.create(config, w(function (_store) { FileStorage.create(config, w(function (err, _store) {
if (err) { throw err; }
config.store = _store; config.store = _store;
})); }));
}).nThen(function (w) { }).nThen(function (w) {

Loading…
Cancel
Save