dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
ansuz 2021-03-04 10:50:07 +05:30
parent 2dbbf972c9 7b9fa59681
commit 561cf96c72
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.example.js
View File

@ -46,7 +46,7 @@ module.exports = {
* 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.
* If you're testing or developing with CryptPad on your local machine then

4
scripts/migrations/migrate-tasks-v1.js
View File

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