diff options
| author |   David Stilwell <stilwelld@att.com> | 2019-04-12 14:31:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-12 14:31:58 +0000 |
| commit | 20831e1c323e23e97f9ff508a683d3aaae070d22 (patch) | |
| tree | 21a43af22ef7fa4d9987fe127ebe557f0cce31dd | |
| parent | 500fbc5d04025a48f8ac9c2955c82806ed49a84a (diff) | |
| parent | b685bb6748b7916f8b63cfe88e5b48282eb13815 (diff) | |
Merge "Handle case where sslcert file is not specified"
Former-commit-id: e56de05dd89dce5f38f94b538f96a1cff36bdb00
| -rwxr-xr-x | admportal/shell/www | 5 | ||||
| -rw-r--r-- | version.properties | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/admportal/shell/www b/admportal/shell/www index 5c639e8f..ef5dcae5 100755 --- a/admportal/shell/www +++ b/admportal/shell/www @@ -12,6 +12,7 @@ var https = require('https'); var http_port = properties.nonSslPort; var https_port = properties.ConexusNetworkPort; var cert_pswd = process.env.CERT_PSWD; +var sslCert = properties.ConexusNetwork_sslCert; if (typeof http_port != 'undefined' && http_port.length > 0) { @@ -23,10 +24,10 @@ if (typeof http_port != 'undefined' && http_port.length > 0) }); } -if (typeof https_port != 'undefined' && https_port.length > 0) +if (typeof https_port != 'undefined' && https_port.length > 0 && sslCert.length > 0) { var sslOptions = { - pfx: fs.readFileSync(properties.ConexusNetwork_sslCert), + pfx: fs.readFileSync(sslCert), passphrase: properties.ConexusNetwork_sslKey, secureOptions: constants.SSL_OP_NO_TLSv1|constants.SSL_OP_NO_SSLv2|constants.SSL_OP_NO_SSLv3, ciphers: [ "AES128-GCM-SHA256","!RC4","HIGH","!MD5","!aNULL","!EDH","!3DES" ].join(':'), diff --git a/version.properties b/version.properties index 2488058e..423a3297 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ release_name=1 sprint_number=5 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} |