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

update

Browse source
This commit is contained in:
fanqq 2015-06-26 15:04:37 +08:00
parent 8dabb4fff0
commit a514265f39
4 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/ctrip/zeus/service/build/conf/ServerConf.java
View file

@ -21,7 +21,7 @@ import java.util.List;
public class ServerConf {
private static final Logger LOGGER = LoggerFactory.getLogger(ServerConf.class);
private static DynamicStringProperty allowSSL = DynamicPropertyFactory.getInstance().getStringProperty("virtual-server-id.ssl", "");
private static final String SSL_PATH = "/data/nginx/ssl/";
public static String generate(Slb slb, VirtualServer vs, List<Group> groups) throws Exception{
StringBuilder b = new StringBuilder(1024);
@ -41,8 +41,8 @@ public class ServerConf {
{
if(String.valueOf(vs.getId()).equals(vsid.trim())){
b.append("ssl on;\n")
.append("ssl_certificate /data/nginx/").append(vs.getId()).append("/ssl.crt;\n")
.append("ssl_certificate_key /data/nginx/").append(vs.getId()).append("/ssl.key;\n");
.append("ssl_certificate ").append(SSL_PATH).append(vs.getId()).append("/ssl.crt;\n")
.append("ssl_certificate_key ").append(SSL_PATH).append(vs.getId()).append("/ssl.key;\n");
}
}
}

1
src/main/java/com/ctrip/zeus/service/validate/SlbValidateLocal.java
View file

@ -1,5 +1,6 @@
package com.ctrip.zeus.service.validate;
import com.ctrip.zeus.model.entity.Slb;
import com.ctrip.zeus.model.entity.SlbValidateResponse;
/**

32
src/main/java/com/ctrip/zeus/service/validate/impl/SlbValidateLocalImpl.java
View file

@ -2,7 +2,9 @@ package com.ctrip.zeus.service.validate.impl;
import com.ctrip.zeus.model.entity.Slb;
import com.ctrip.zeus.model.entity.SlbValidateResponse;
import com.ctrip.zeus.model.entity.VirtualServer;
import com.ctrip.zeus.nginx.LocalValidate;
import com.ctrip.zeus.nginx.entity.NginxResponse;
import com.ctrip.zeus.service.model.SlbRepository;
import com.ctrip.zeus.service.validate.SlbValidateLocal;
@ -20,15 +22,39 @@ public class SlbValidateLocalImpl implements SlbValidateLocal {
@Override
public SlbValidateResponse validate(Long slbId) throws Exception {
SlbValidateResponse response = new SlbValidateResponse();
response.setSlbId(slbId);
Slb slb = slbRepository.getById(slbId);
if (slb == null)
{
response.setSlbId(slbId).setSucceed(false).setMsg("Not found Slb by slbId!");
response.setSucceed(false).setMsg("Not found Slb by slbId!");
return response;
}
if (!validateNginxBinAndConf(slb)){
response.setSucceed(false).setMsg("slb conf path or bin path is not exist!");
return response;
}
NginxResponse res = localValidate.nginxIsUp(slb.getNginxBin());
if (!res.getSucceed()){
response.setSucceed(false).setMsg(res.getOutMsg());
return response;
}
for (VirtualServer vs : slb.getVirtualServers())
{
if (vs.getSsl())
{
}
}
return null;
}
private boolean validateNginxBinAndConf(Slb slb) throws Exception {
return localValidate.pathExistValidate(slb.getNginxBin(),true)&&
localValidate.pathExistValidate(slb.getNginxConf(),true);
}
private boolean validateNginxIsUp(Slb slb)throws Exception{
}
}

1
src/test/resources/com/ctrip/zeus/model/model.xml
View file

@ -199,6 +199,7 @@
<succeed>true</succeed>
<msg>msg</msg>
<slb-id>12345678901</slb-id>
<ip>127.0.0.1</ip>
</slb-validate-response>