Смержены изменения с бранча касающиеся корневых сертификатов.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/nodeJSProjects@60822 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Alexey.Golubev
2015-02-03 08:27:33 +00:00
committed by Alexander.Trofimov
parent 9de6a9d5d5
commit efee9ecc36
4 changed files with 56 additions and 8 deletions

View File

@ -0,0 +1,44 @@
{
"server": {
"port": 443,
"mode": "production"
},
"dictionaries": [
{"name": "ca_ES", "id": 1027},
{"name": "cs_CZ", "id": 1029},
{"name": "da_DK", "id": 1030},
{"name": "de_DE", "id": 1031},
{"name": "el_GR", "id": 1032},
{"name": "en_US", "id": 1033},
{"name": "fr_FR", "id": 1036},
{"name": "hu_HU", "id": 1038},
{"name": "it_IT", "id": 1040},
{"name": "ko_KR", "id": 1042},
{"name": "nl_NL", "id": 1043},
{"name": "nb_NO", "id": 1044},
{"name": "pl_PL", "id": 1045},
{"name": "pt_BR", "id": 1046},
{"name": "ro_RO", "id": 1048},
{"name": "ru_RU", "id": 1049},
{"name": "sk_SK", "id": 1051},
{"name": "sv_SE", "id": 1053},
{"name": "tr_TR", "id": 1055},
{"name": "uk_UA", "id": 1058},
{"name": "lv_LV", "id": 1062},
{"name": "lt_LT", "id": 1063},
{"name": "vi_VN", "id": 1066},
{"name": "az_Latn_AZ", "id": 1068},
{"name": "de_CH", "id": 2055},
{"name": "en_GB", "id": 2057},
{"name": "nn_NO", "id": 2068},
{"name": "pt_PT", "id": 2070},
{"name": "de_AT", "id": 3079},
{"name": "en_AU", "id": 3081},
{"name": "es_ES", "id": 3082}
],
"ssl":{
"key": "../cert/privatekey.pem",
"cert": "../cert/certificate.pem",
"ca": "../cert/gd_bundle-g2.pem"
}
}

View File

@ -17,9 +17,10 @@ var server = {};
if (config['ssl']) {
var privateKey = fs.readFileSync(config['ssl']['key']).toString();
var certificate = fs.readFileSync(config['ssl']['cert']).toString();
var options = {key: privateKey, cert:certificate};
var certificateKey = fs.readFileSync(config['ssl']['cert']).toString();
var trustedCertificate = fs.readFileSync(config['ssl']['ca']).toString();
//See detailed options format here: http://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener
var options = {key: privateKey, cert: certificateKey, ca: [trustedCertificate]};
server = https.createServer(options, app);
} else {