move wellKnownJson to domains

after some more thought:
* If app moves to another location, user has to remember to move all this config
* It's not really associated with an app. It's to do with the domain info
* We can put some hints in the UI if app is missing.

part of #703
This commit is contained in:
Girish Ramakrishnan
2020-12-23 15:34:23 -08:00
parent 8a17e13ec4
commit 663e0952fc
24 changed files with 100 additions and 98 deletions

View File

@@ -83,7 +83,8 @@ describe('Apps', function () {
provider: 'noop',
config: { },
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
tlsConfig: { provider: 'fallback' },
wellKnown: null
};
const DOMAIN_1 = {
@@ -92,7 +93,8 @@ describe('Apps', function () {
provider: 'noop',
config: { },
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
tlsConfig: { provider: 'fallback' },
wellKnown: null
};
var APP_0 = {

View File

@@ -58,7 +58,8 @@ const DOMAIN_0 = {
endpoint: 'http://localhost:5353'
},
fallbackCertificate: null,
tlsConfig: { provider: 'letsencrypt-staging' }
tlsConfig: { provider: 'letsencrypt-staging' },
wellKnown: null
};
let AUDIT_SOURCE = { ip: '1.2.3.4' };

View File

@@ -168,7 +168,8 @@ describe('backups', function () {
provider: 'manual',
config: { },
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
tlsConfig: { provider: 'fallback' },
wellKnown: null
};
const AUDIT_SOURCE = { ip: '1.2.3.4' };

View File

@@ -85,7 +85,8 @@ const DOMAIN_0 = {
zoneName: 'foobar.com',
provider: 'digitalocean',
config: { token: 'abcd' },
tlsConfig: { provider: 'fallback' }
tlsConfig: { provider: 'fallback' },
wellKnown: null
};
const DOMAIN_1 = {
@@ -93,7 +94,8 @@ const DOMAIN_1 = {
zoneName: 'cloudron.io',
provider: 'manual',
config: null,
tlsConfig: { provider: 'fallback' }
tlsConfig: { provider: 'fallback' },
wellKnown: null
};
describe('database', function () {

View File

@@ -22,7 +22,8 @@ var DOMAIN_0 = {
provider: 'noop',
config: {},
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
tlsConfig: { provider: 'fallback' },
wellKnown: null
};
var AUDIT_SOURCE = { ip: '1.2.3.4' };

View File

@@ -40,7 +40,8 @@ const DOMAIN_0 = {
provider: 'manual',
config: {},
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
tlsConfig: { provider: 'fallback' },
wellKnown: null
};
const LDAP_SHARED_PASSWORD = 'validpassword';

View File

@@ -24,7 +24,8 @@ var GROUP1_NAME = 'externs',
const DOMAIN_0 = {
domain: 'example.com',
zoneName: 'example.com',
config: { provider: 'manual' }
config: { provider: 'manual' },
wellKnown: null
};
var USER_0 = {

View File

@@ -29,7 +29,8 @@ const DOMAIN_0 = {
config: {},
provider: 'manual',
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
tlsConfig: { provider: 'fallback' },
wellKnown: null
};
// owner

View File

@@ -21,7 +21,8 @@ const DOMAIN_0 = {
provider: 'manual',
config: {},
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
tlsConfig: { provider: 'fallback' },
wellKnown: null
};
const AUDIT_SOURCE = {

View File

@@ -18,7 +18,8 @@ const DOMAIN_0 = {
provider: 'noop',
config: {},
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
tlsConfig: { provider: 'fallback' },
wellKnown: null
};
let AUDIT_SOURCE = { ip: '1.2.3.4' };

View File

@@ -41,7 +41,8 @@ const DOMAIN_0 = {
config: {},
provider: 'manual',
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
tlsConfig: { provider: 'fallback' },
wellKnown: null
};
var AUDIT_SOURCE = {

View File

@@ -37,7 +37,8 @@ const DOMAIN_0 = {
provider: 'manual',
config: {},
fallbackCertificate: null,
tlsConfig: { provider: 'fallback' }
tlsConfig: { provider: 'fallback' },
wellKnown: null
};
function cleanupUsers(done) {

View File

@@ -66,6 +66,7 @@ describe('Volumes', function () {
it('cannot add duplicate name', function (done) {
volumes.add('music', '/media/music', AUDIT_SOURCE, function (error) {
console.dir(error);
expect(error.reason).to.be(BoxError.ALREADY_EXISTS);
done();
});
@@ -110,4 +111,4 @@ describe('Volumes', function () {
done();
});
});
});
});