The-pack-family/APIv3
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for reading the http keystore path + keystore password from our config file

Browse Source
This commit is contained in:
Colin McDonald 2016-07-10 12:50:04 -04:00
parent 5aa0827d18
commit e4a574852a
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apiv3.properties
View File

@ -6,6 +6,8 @@ mongo.password=
redis.address=209.222.96.50 redis.address=209.222.96.50
redis.port=6379 redis.port=6379
http.port=80 http.port=80
http.keystoreFile=/home/keystore.idk
http.keystorePassword=123abc
librato.email=cmcdonald.main@gmail.com librato.email=cmcdonald.main@gmail.com
librato.apiToken=a818c3eca8a59d6d9cf76dc9f0d237c6aa97f257c482ce3363cf55a5431bc153 librato.apiToken=a818c3eca8a59d6d9cf76dc9f0d237c6aa97f257c482ce3363cf55a5431bc153
librato.sourceIdentifier=apiv3-dev-01 librato.sourceIdentifier=apiv3-dev-01

21
src/main/java/net/frozenorb/apiv3/APIv3.java
View File

@ -28,6 +28,7 @@ import io.vertx.core.http.HttpHeaders;
import io.vertx.core.http.HttpMethod; import io.vertx.core.http.HttpMethod;
import io.vertx.core.http.HttpServer; import io.vertx.core.http.HttpServer;
import io.vertx.core.http.HttpServerOptions; import io.vertx.core.http.HttpServerOptions;
import io.vertx.core.net.JksOptions;
import io.vertx.ext.web.Router; import io.vertx.ext.web.Router;
import io.vertx.ext.web.RoutingContext; import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.handler.BodyHandler; import io.vertx.ext.web.handler.BodyHandler;
@ -253,14 +254,20 @@ public final class APIv3 extends AbstractVerticle {
} }
private void setupHttpServer() { private void setupHttpServer() {
HttpServer webServer = vertx.createHttpServer( HttpServerOptions httpServerOptions = new HttpServerOptions();
new HttpServerOptions() httpServerOptions.setCompressionSupported(true);
//.setSsl(true)
//.setKeyStoreOptions(new JksOptions().setPath("c:\\Users\\cmcdonald\\Desktop\\apiv3.jks").setPassword("password"))
.setCompressionSupported(true)
);
Router http = Router.router(vertx); if (!config.getProperty("http.keystoreFile").isEmpty()) {
httpServerOptions.setSsl(true);
httpServerOptions.setKeyStoreOptions(
new JksOptions()
.setPassword(config.getProperty("http.keystorePassword"))
.setPath(config.getProperty("http.keystoreFile"))
);
}
HttpServer webServer = vertx.createHttpServer(httpServerOptions);
Router http = Router.router(vertx); // we just name this http to make the route declarations easier to read
http.route().handler(LoggerHandler.create(LoggerFormat.TINY)); http.route().handler(LoggerHandler.create(LoggerFormat.TINY));
http.route().handler(TimeoutHandler.create(TimeUnit.SECONDS.toMillis(5))); http.route().handler(TimeoutHandler.create(TimeUnit.SECONDS.toMillis(5)));