Merge branch 'query_signer' of github.com:m-chrzan/CloudAtlas into query_signer

1 files changed, 22 insertions, 0 deletions

diff --git a/build.gradle b/build.gradle
index d7909f7..c6ebcae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,6 +46,10 @@ ext.UDUPServerBufsize = {
     return System.getProperty("bufsize") ?: 512;
 }
 
+ext.querySignerHostname = {
+    return System.getProperty("querySignerHostname") ?: "localhost"
+}
+
 /*
 Possible options:
 RoundRobinExp
@@ -61,6 +65,14 @@ ext.zonePath = {
     return System.getProperty("zonePath") ?: "/uw/violet07"
 }
 
+ext.publicKeyFilename = {
+    return System.getProperty("publicKeyFilename") ?: "build/tmp/query_signer.pub"
+}
+
+ext.privateKeyFilename = {
+    return System.getProperty("privateKeyFilename") ?: "build/tmp/query_signer"
+}
+
 repositories {
     // Use jcenter for resolving dependencies.
     // You can declare any Maven/Ivy/file repository here.
@@ -110,6 +122,7 @@ task runAgent(type: JavaExec) {
     systemProperty 'UDUPServer.bufsize', UDUPServerBufsize()
     systemProperty 'Gossip.zone_strategy', zoneSelectionStrategy()
     systemProperty 'zone_path', zonePath()
+    systemProperty 'public_key_file', publicKeyFilename()
 }
 
 task runClient(type: JavaExec) {
@@ -117,6 +130,7 @@ task runClient(type: JavaExec) {
     main = 'pl.edu.mimuw.cloudatlas.client.Client'
     systemProperty 'agent_hostname', hostname()
     systemProperty 'zone_path', zonePath()
+    systemProperty 'query_signer_hostname', querySignerHostname()
 }
 
 task runFetcher(type: JavaExec) {
@@ -131,3 +145,11 @@ task runInterpreter(type: JavaExec) {
     main = 'pl.edu.mimuw.cloudatlas.interpreter.Main'
     standardInput = System.in
 }
+
+task runQuerySigner(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    main = 'pl.edu.mimuw.cloudatlas.querysigner.QuerySigner'
+    systemProperty 'query_signer_hostname', querySignerHostname()
+    systemProperty 'public_key_file', publicKeyFilename()
+    systemProperty 'private_key_file', privateKeyFilename()
+}