File tree Expand file tree Collapse file tree 2 files changed +10
-2
lines changed
Expand file tree Collapse file tree 2 files changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -12,6 +12,6 @@ function getFile (path) {
1212module . exports = {
1313 sslkeypath : getFile ( '/run/secrets/key.pem' ) ,
1414 sslcertpath : getFile ( '/run/secrets/cert.pem' ) ,
15- sslcapath : getFile ( '/run/secrets/ca.pem' ) ,
15+ sslcapath : getFile ( '/run/secrets/ca.pem' ) !== undefined ? [ getFile ( '/run/secrets/ca.pem' ) ] : [ ] ,
1616 dhparampath : getFile ( '/run/secrets/dhparam.pem' )
1717}
Original file line number Diff line number Diff line change @@ -95,7 +95,15 @@ config.isLDAPEnable = config.ldap.url
9595config . isPDFExportEnable = config . allowpdfexport
9696
9797// generate correct path
98- config . sslcapath = path . join ( appRootPath , config . sslcapath )
98+ config . sslcapath = ( function ( ) {
99+ var i , len , results
100+ results = [ ]
101+ for ( i = 0 , len = config . sslcapath . length ; i < len ; i ++ ) {
102+ results . push ( path . resolve ( appRootPath , config . sslcapath [ i ] ) )
103+ }
104+ return results
105+ } ) ( )
106+
99107config . sslcertpath = path . join ( appRootPath , config . sslcertpath )
100108config . sslkeypath = path . join ( appRootPath , config . sslkeypath )
101109config . dhparampath = path . join ( appRootPath , config . dhparampath )
You can’t perform that action at this time.
0 commit comments