change key server url in stable channel

This commit is contained in:
Tankred Hase 2013-12-02 10:33:45 +01:00
parent e316a89d24
commit ae2b46ed26
2 changed files with 7 additions and 2 deletions

View File

@ -277,7 +277,8 @@ module.exports = function(grunt) {
patchManifest({ patchManifest({
suffix: ' (Alpha)', suffix: ' (Alpha)',
version: version, version: version,
deleteKey: true deleteKey: true,
keyServer: 'https://keys.whiteout.io'
}); });
}); });
@ -295,6 +296,10 @@ module.exports = function(grunt) {
if (options.client_id) { if (options.client_id) {
manifest.oauth2.client_id = options.client_id; manifest.oauth2.client_id = options.client_id;
} }
if (options.keyServer) {
var ksIndex = manifest.permissions.indexOf('https://keys-test.whiteout.io');
manifest.permissions[ksIndex] = options.keyServer;
}
if (options.deleteKey) { if (options.deleteKey) {
delete manifest.key; delete manifest.key;
} }

View File

@ -9,7 +9,7 @@ define(function(require) {
try { try {
var manifest = chrome.runtime.getManifest(); var manifest = chrome.runtime.getManifest();
cloudUrl = _.find(manifest.permissions, function(permission) { cloudUrl = _.find(manifest.permissions, function(permission) {
return typeof permission === 'string' && permission.indexOf('http') === 0; return typeof permission === 'string' && permission.indexOf('https://keys') === 0;
}); });
clientId = manifest.oauth2.client_id; clientId = manifest.oauth2.client_id;
} catch (e) {} } catch (e) {}