From 6373090feadf7a952e6fd7b081c7a90f8b60140a Mon Sep 17 00:00:00 2001
From: Spencer Brown <spencer@privategrity.com>
Date: Mon, 18 Feb 2019 10:50:13 -0800
Subject: [PATCH] Use relative paths for key files
---
basice2e/gateway.yaml | 6 +++---
basice2e/run.sh | 6 +++---
basice2e/server-1.yaml | 6 +++---
basice2e/server-2.yaml | 6 +++---
basice2e/server-3.yaml | 6 +++---
basice2e/server-4.yaml | 6 +++---
basice2e/server-5.yaml | 6 +++---
basice2e/udb.yaml | 2 +-
8 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/basice2e/gateway.yaml b/basice2e/gateway.yaml
index 3bb6236..7b7fc4c 100644
--- a/basice2e/gateway.yaml
+++ b/basice2e/gateway.yaml
@@ -26,9 +26,9 @@ GatewayAddress: "localhost:8443"
# deleted from the user's message queue
MessageTimeout: 1800
-keyPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/gateway.cmix.rip.key"
-certPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/gateway.cmix.rip.crt"
-serverCertPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/cmix.rip.crt"
+keyPath: "../keys/gateway.cmix.rip.key"
+certPath: "../keys/gateway.cmix.rip.crt"
+serverCertPath: "../keys/cmix.rip.crt"
### Anything below this line is to be deprecated ###
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 88bd025..157ef4a 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -101,7 +101,7 @@ echo $PIDVAL >> results/serverpids
echo "$UDBCMD -- $PIDVAL"
# Start a dummy client
-DUMMYCMD="../bin/client -i 35 -d 35 -g $GATEWAY --numnodes 5 -m \"dummy\" --dummyfrequency 2 --certpath /home/spencer/go/src/gitlab.com/elixxir/integration/keys/gateway.cmix.rip.crt -f blobdummy"
+DUMMYCMD="../bin/client -i 35 -d 35 -g $GATEWAY --numnodes 5 -m \"dummy\" --dummyfrequency 2 --certpath ../keys/gateway.cmix.rip.crt -f blobdummy"
$DUMMYCMD >> $DUMMYOUT 2>&1 &
PIDVAL=$!
echo $PIDVAL >> results/serverpids
@@ -117,7 +117,7 @@ echo "$GATEWAYCMD -- $PIDVAL"
# Send a registration command
cat registration-commands.txt | while read LINE
do
- CLIENTCMD="timeout 90s ../bin/client -f blob9 --numnodes 5 -g $GATEWAY -i 9 -d 3 --certpath /home/spencer/go/src/gitlab.com/elixxir/integration/keys/gateway.cmix.rip.crt -m \"$LINE\""
+ CLIENTCMD="timeout 90s ../bin/client -f blob9 --numnodes 5 -g $GATEWAY -i 9 -d 3 --certpath ../keys/gateway.cmix.rip.crt -m \"$LINE\""
eval $CLIENTCMD >> $CLIENTOUT/client9.out 2>&1 &
PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL"
@@ -125,7 +125,7 @@ do
done
# Send a channel message that all clients will receive
-CLIENTCMD="timeout 60s ../bin/client -f blob8 --numnodes 5 --certpath /home/spencer/go/src/gitlab.com/elixxir/integration/keys/gateway.cmix.rip.crt -g $GATEWAY -i 8 -d 31 -m \"Channel, Hello\""
+CLIENTCMD="timeout 60s ../bin/client -f blob8 --numnodes 5 --certpath ../keys/gateway.cmix.rip.crt -g $GATEWAY -i 8 -d 31 -m \"Channel, Hello\""
eval $CLIENTCMD >> $CLIENTOUT/client8.out 2>&1 &
PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL"
diff --git a/basice2e/server-1.yaml b/basice2e/server-1.yaml
index b45f9da..389959d 100644
--- a/basice2e/server-1.yaml
+++ b/basice2e/server-1.yaml
@@ -18,6 +18,6 @@ servers:
- localhost:50004
gateways:
- "localhost:8443"
-keyPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/cmix.rip.key"
-certPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/cmix.rip.crt"
-gatewayCertPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/gateway.cmix.rip.crt"
+keyPath: "../keys/cmix.rip.key"
+certPath: "../keys/cmix.rip.crt"
+gatewayCertPath: "../keys/gateway.cmix.rip.crt"
diff --git a/basice2e/server-2.yaml b/basice2e/server-2.yaml
index 9b68cc1..66853d5 100644
--- a/basice2e/server-2.yaml
+++ b/basice2e/server-2.yaml
@@ -18,6 +18,6 @@ servers:
- localhost:50004
gateways:
- "localhost:8443"
-keyPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/cmix.rip.key"
-certPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/cmix.rip.crt"
-gatewayCertPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/gateway.cmix.rip.crt"
+keyPath: "../keys/cmix.rip.key"
+certPath: "../keys/cmix.rip.crt"
+gatewayCertPath: "../keys/gateway.cmix.rip.crt"
diff --git a/basice2e/server-3.yaml b/basice2e/server-3.yaml
index 3ef2c5b..5fbfbe8 100644
--- a/basice2e/server-3.yaml
+++ b/basice2e/server-3.yaml
@@ -18,6 +18,6 @@ servers:
- localhost:50004
gateways:
- "localhost:8443"
-keyPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/cmix.rip.key"
-certPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/cmix.rip.crt"
-gatewayCertPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/gateway.cmix.rip.crt"
+keyPath: "../keys/cmix.rip.key"
+certPath: "../keys/cmix.rip.crt"
+gatewayCertPath: "../keys/gateway.cmix.rip.crt"
diff --git a/basice2e/server-4.yaml b/basice2e/server-4.yaml
index ae783b9..da56647 100644
--- a/basice2e/server-4.yaml
+++ b/basice2e/server-4.yaml
@@ -18,6 +18,6 @@ servers:
- localhost:50004
gateways:
- "localhost:8443"
-keyPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/cmix.rip.key"
-certPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/cmix.rip.crt"
-gatewayCertPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/gateway.cmix.rip.crt"
+keyPath: "../keys/cmix.rip.key"
+certPath: "../keys/cmix.rip.crt"
+gatewayCertPath: "../keys/gateway.cmix.rip.crt"
diff --git a/basice2e/server-5.yaml b/basice2e/server-5.yaml
index 924ae58..6f263c8 100644
--- a/basice2e/server-5.yaml
+++ b/basice2e/server-5.yaml
@@ -18,6 +18,6 @@ servers:
- localhost:50004
gateways:
- "localhost:8443"
-keyPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/cmix.rip.key"
-certPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/cmix.rip.crt"
-gatewayCertPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/gateway.cmix.rip.crt"
+keyPath: "../keys/cmix.rip.key"
+certPath: "../keys/cmix.rip.crt"
+gatewayCertPath: "../keys/gateway.cmix.rip.crt"
diff --git a/basice2e/udb.yaml b/basice2e/udb.yaml
index 59d8da7..67b314b 100644
--- a/basice2e/udb.yaml
+++ b/basice2e/udb.yaml
@@ -3,4 +3,4 @@ logPath: "logfile.log"
numNodes: 5
gateways:
- "localhost:8443"
-certPath: "/home/spencer/go/src/gitlab.com/elixxir/integration/keys/gateway.cmix.rip.crt"
+certPath: "../keys/gateway.cmix.rip.crt"
--
GitLab