diff --git a/basice2e/gateway.yaml b/basice2e/gateway.yaml index 3bb62365984da23368846dcee9979ee51bd017cd..7b7fc4cacd2b9a8682518d65943e3015fc17daf9 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 88bd025126e1946cefc17879db0c46037251d114..157ef4a4af6bbd81dc17b39c65ec8d91c1dc8bde 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 b45f9da91c5a2660e42049424b9e3eb5aa066029..389959d6683c12921f6df98db8d506c4da7af29d 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 9b68cc17c2650af5b04786314c9d92e343f43593..66853d5da8a42b5378a27861819c56bb7485e651 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 3ef2c5bc1b5f0f4ec532653ad2d0ca1170f6b4d9..5fbfbe863389c1a0e21bd16a3654d11b0076cc9f 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 ae783b96072109899a8620cac554cfbad51159f7..da566476b9c0184f5e01e98eac3a7fb544595e84 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 924ae58cdcf96e52e2445b9aa036b4337eb7e884..6f263c88e2a1d42b0b1b4341532612b13a8e1e02 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 59d8da7f155870e0f1eef08609e35ea0fc4b7400..67b314baebb98e3ac5dd96515be5202ff08e8d71 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"