|
@@ -129,18 +129,19 @@
|
|
|
protocols="TLSv1.2"
|
|
|
certificateVerification="required"
|
|
|
certificateVerificationDepth="10"
|
|
|
- caCertificatePath="conf"
|
|
|
+ caCertificatePath="/etc/ssl/certs"
|
|
|
>
|
|
|
- <Certificate
|
|
|
- certificateFile="conf/merlinOld.crt"
|
|
|
- certificateKeyFile="conf/merlinOld.key"
|
|
|
- certificateChainFile="conf/NIXLJU-CA_chainOld.crt"
|
|
|
+ <!--<Certificate
|
|
|
+ certificateFile="conf/SSL/merlinOld.crt"
|
|
|
+ certificateKeyFile="conf/SSL/merlinOld.key"
|
|
|
+ certificateChainFile="/etc/ssl/certs/CAOld_chain.pem"
|
|
|
type="RSA"
|
|
|
- />
|
|
|
+ />
|
|
|
+ -->
|
|
|
<Certificate
|
|
|
- certificateFile="conf/merlin.crt"
|
|
|
- certificateKeyFile="conf/merlin.key"
|
|
|
- certificateChainFile="conf/NIXLJU-CA_chain.crt"
|
|
|
+ certificateFile="conf/SSL/merlin.crt"
|
|
|
+ certificateKeyFile="conf/SSL/merlin.key"
|
|
|
+ certificateChainFile="/etc/ssl/certs/CA_chain.pem"
|
|
|
type="RSA"
|
|
|
/>
|
|
|
|