web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

start deprecating usage of myDomain

Browse Source
This commit is contained in:
ansuz 2020-02-28 11:45:22 -05:00
parent de6b9e2228
commit 03ff9bd0d7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/historyKeeper.js
View File

@ -66,7 +66,8 @@ module.exports.create = function (config, cb) {
flushCache: config.flushCache, flushCache: config.flushCache,
adminEmail: config.adminEmail, adminEmail: config.adminEmail,
allowSubscriptions: config.allowSubscriptions, allowSubscriptions: config.allowSubscriptions,
myDomain: config.myDomain, myDomain: config.httpUnsafeOrigin,
// XXX not included in the config...
mySubdomain: config.mySubdomain, mySubdomain: config.mySubdomain,
customLimits: config.customLimits || {}, customLimits: config.customLimits || {},
// FIXME this attribute isn't in the default conf // FIXME this attribute isn't in the default conf

2
scripts/check-accounts.js
View File

@ -4,7 +4,7 @@ var Config = require("../lib/load-config");
var Package = require("../package.json"); var Package = require("../package.json");
var body = JSON.stringify({ var body = JSON.stringify({
domain: Config.myDomain, domain: Config.myDomain || Config.httpUnsafeOrigin,
subdomain: Config.mySubdomain || null, subdomain: Config.mySubdomain || null,
adminEmail: Config.adminEmail, adminEmail: Config.adminEmail,
version: Package.version, version: Package.version,