ctripcorp/zeus
1
1
Fork 0
mirror of https://github.com/ctripcorp/zeus.git synced 2024-09-20 23:56:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

change cert check order

Browse source
This commit is contained in:
Mengyi Zhou 2016-08-01 15:36:07 +08:00
parent 5d9ae424bd
commit ada2b5bc98
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/ctrip/zeus/service/nginx/impl/DefaultCertificateInstaller.java
View file

@ -91,12 +91,6 @@ public class DefaultCertificateInstaller implements CertificateInstaller {
@Override
public void installDefault() throws Exception {
CertificateDo cert = certificateDao.findMaxByDomainAndState(localhost, CertificateConfig.ONBOARD, CertificateEntity.READSET_FULL);
if (cert == null) {
logger.error("Could not find default certificate to install.");
return;
}
String defaultPath = config.getInstallDir(0L);
defaultPath = defaultPath.substring(0, defaultPath.lastIndexOf("/")) + "/default";
File f = new File(defaultPath);
@ -107,6 +101,12 @@ public class DefaultCertificateInstaller implements CertificateInstaller {
f.mkdirs();
}
CertificateDo cert = certificateDao.findMaxByDomainAndState(localhost, CertificateConfig.ONBOARD, CertificateEntity.READSET_FULL);
if (cert == null) {
logger.error("Could not find default certificate to install.");
return;
}
OutputStream certos = new FileOutputStream(f.getPath() + "/ssl.crt", config.getWriteFileOption());
OutputStream keyos = new FileOutputStream(f.getPath() + "/ssl.key", config.getWriteFileOption());
try {