From c104d5e942f4ea920d437d2010c5fc9081b74a01 Mon Sep 17 00:00:00 2001
From: Jono Wenger <jono@elixxir.io>
Date: Tue, 27 Jul 2021 14:50:02 -0700
Subject: [PATCH] Update server and gateway YAML files

---
 basice2e/gateway-1.yaml   | 6 +++---
 basice2e/gateway-2.yaml   | 6 +++---
 basice2e/gateway-3.yaml   | 6 +++---
 basice2e/gateway-4.yaml   | 6 +++---
 basice2e/gateway-5.yaml   | 6 +++---
 basice2e/server-1.yaml    | 4 ++--
 basice2e/server-2.yaml    | 4 ++--
 basice2e/server-3.yaml    | 4 ++--
 basice2e/server-4.yaml    | 4 ++--
 basice2e/server-5.yaml    | 4 ++--
 smokeinfra/gateway-1.yaml | 6 +++---
 smokeinfra/gateway-2.yaml | 6 +++---
 smokeinfra/gateway-3.yaml | 6 +++---
 smokeinfra/server-1.yaml  | 4 ++--
 smokeinfra/server-2.yaml  | 4 ++--
 smokeinfra/server-3.yaml  | 4 ++--
 16 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/basice2e/gateway-1.yaml b/basice2e/gateway-1.yaml
index 68f4d55..7b66bb1 100644
--- a/basice2e/gateway-1.yaml
+++ b/basice2e/gateway-1.yaml
@@ -12,7 +12,7 @@ log: "results/gateways/gateway-1.log"
 logLevel: 1
 
 # The public IP address and port of the node associated with this gateway
-nodeAddress: "127.0.0.1:50000"
+cmixAddress: "127.0.0.1:50000"
 
 # Port for Gateway to listen on. Gateway must be the only listener on this port.
 # Required field.
@@ -36,9 +36,9 @@ keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
 # Path to the permissioning certificate
-permissioningCertPath: "../keys/cmix.rip.crt"
+schedulingCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-serverCertPath: "../keys/cmix.rip.crt"
+cmixCertPath: "../keys/cmix.rip.crt"
 
 devMode: true
 
diff --git a/basice2e/gateway-2.yaml b/basice2e/gateway-2.yaml
index d01a93f..7ea7802 100644
--- a/basice2e/gateway-2.yaml
+++ b/basice2e/gateway-2.yaml
@@ -12,7 +12,7 @@ log: "results/gateways/gateway-2.log"
 logLevel: 1
 
 # The public IP address and port of the node associated with this gateway
-nodeAddress: "127.0.0.1:50001"
+cmixAddress: "127.0.0.1:50001"
 
 # Port for Gateway to listen on. Gateway must be the only listener on this port.
 # Required field.
@@ -36,9 +36,9 @@ keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
 # Path to the permissioning certificate
-permissioningCertPath: "../keys/cmix.rip.crt"
+schedulingCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-serverCertPath: "../keys/cmix.rip.crt"
+cmixCertPath: "../keys/cmix.rip.crt"
 
 devMode: true
 
diff --git a/basice2e/gateway-3.yaml b/basice2e/gateway-3.yaml
index 954dbef..406c15c 100644
--- a/basice2e/gateway-3.yaml
+++ b/basice2e/gateway-3.yaml
@@ -12,7 +12,7 @@ log: "results/gateways/gateway-3.log"
 logLevel: 1
 
 # The public IP address and port of the node associated with this gateway
-nodeAddress: "127.0.0.1:50002"
+cmixAddress: "127.0.0.1:50002"
 
 # Port for Gateway to listen on. Gateway must be the only listener on this port.
 # Required field.
@@ -36,9 +36,9 @@ keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
 # Path to the permissioning certificate
-permissioningCertPath: "../keys/cmix.rip.crt"
+schedulingCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-serverCertPath: "../keys/cmix.rip.crt"
+cmixCertPath: "../keys/cmix.rip.crt"
 
 devMode: true
 
diff --git a/basice2e/gateway-4.yaml b/basice2e/gateway-4.yaml
index 8a2e2d1..a72048f 100644
--- a/basice2e/gateway-4.yaml
+++ b/basice2e/gateway-4.yaml
@@ -12,7 +12,7 @@ log: "results/gateways/gateway-4.log"
 logLevel: 1
 
 # The public IP address and port of the node associated with this gateway
-nodeAddress: "127.0.0.1:50003"
+cmixAddress: "127.0.0.1:50003"
 
 # Port for Gateway to listen on. Gateway must be the only listener on this port.
 # Required field.
@@ -36,9 +36,9 @@ keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
 # Path to the permissioning certificate
-permissioningCertPath: "../keys/cmix.rip.crt"
+schedulingCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-serverCertPath: "../keys/cmix.rip.crt"
+cmixCertPath: "../keys/cmix.rip.crt"
 
 devMode: true
 
diff --git a/basice2e/gateway-5.yaml b/basice2e/gateway-5.yaml
index 079566e..353dc07 100644
--- a/basice2e/gateway-5.yaml
+++ b/basice2e/gateway-5.yaml
@@ -12,7 +12,7 @@ log: "results/gateways/gateway-5.log"
 logLevel: 1
 
 # The public IP address and port of the node associated with this gateway
-nodeAddress: "127.0.0.1:50004"
+cmixAddress: "127.0.0.1:50004"
 
 # Port for Gateway to listen on. Gateway must be the only listener on this port.
 # Required field.
@@ -36,9 +36,9 @@ keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
 # Path to the permissioning certificate
-permissioningCertPath: "../keys/cmix.rip.crt"
+schedulingCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-serverCertPath: "../keys/cmix.rip.crt"
+cmixCertPath: "../keys/cmix.rip.crt"
 
 devMode: true
 
diff --git a/basice2e/server-1.yaml b/basice2e/server-1.yaml
index d920328..0315dc8 100644
--- a/basice2e/server-1.yaml
+++ b/basice2e/server-1.yaml
@@ -9,7 +9,7 @@ registrationCode: "qpol"
 useGPU: false
 devMode: true
 logLevel: 1
-node:
+cmix:
     paths:
         idf:  "results/servers/nodeID-1.json"
         cert: "../keys/cmix.rip.crt"
@@ -27,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-permissioning:
+scheduling:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
diff --git a/basice2e/server-2.yaml b/basice2e/server-2.yaml
index 9a7c110..46cc443 100644
--- a/basice2e/server-2.yaml
+++ b/basice2e/server-2.yaml
@@ -9,7 +9,7 @@ registrationCode: "yiiq"
 useGPU: false
 devMode: true
 logLevel: 1
-node:
+cmix:
     paths:
         idf:  "results/servers/nodeID-2.json"
         cert: "../keys/cmix.rip.crt"
@@ -27,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-permissioning:
+scheduling:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
diff --git a/basice2e/server-3.yaml b/basice2e/server-3.yaml
index 0935874..2a21560 100644
--- a/basice2e/server-3.yaml
+++ b/basice2e/server-3.yaml
@@ -9,7 +9,7 @@ registrationCode: "vydz"
 useGPU: false
 devMode: true
 logLevel: 1
-node:
+cmix:
     paths:
         idf:  "results/servers/nodeID-3.json"
         cert: "../keys/cmix.rip.crt"
@@ -27,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-permissioning:
+scheduling:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
diff --git a/basice2e/server-4.yaml b/basice2e/server-4.yaml
index 7f32cae..4610724 100644
--- a/basice2e/server-4.yaml
+++ b/basice2e/server-4.yaml
@@ -9,7 +9,7 @@ registrationCode: "gwxs"
 useGPU: false
 devMode: true
 logLevel: 1
-node:
+cmix:
     paths:
         idf:  "results/servers/nodeID-4.json"
         cert: "../keys/cmix.rip.crt"
@@ -27,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-permissioning:
+scheduling:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
diff --git a/basice2e/server-5.yaml b/basice2e/server-5.yaml
index 494f901..42ac921 100644
--- a/basice2e/server-5.yaml
+++ b/basice2e/server-5.yaml
@@ -9,7 +9,7 @@ registrationCode: "nahv"
 useGPU: false
 devMode: true
 logLevel: 1
-node:
+cmix:
     paths:
         idf:  "results/servers/nodeID-5.json"
         cert: "../keys/cmix.rip.crt"
@@ -27,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-permissioning:
+scheduling:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
diff --git a/smokeinfra/gateway-1.yaml b/smokeinfra/gateway-1.yaml
index 259c700..a305d5a 100644
--- a/smokeinfra/gateway-1.yaml
+++ b/smokeinfra/gateway-1.yaml
@@ -12,7 +12,7 @@ log: "results/gatway-1.log"
 logLevel: 2
 
 # The public IP address and port of the node associated with this gateway
-nodeAddress: "127.0.0.1:60000"
+cmixAddress: "127.0.0.1:60000"
 
 # The public IPv4 address of the Gateway, as reported to the network, to use
 # instead of dynamically looking up Gateway's own IP address. If a port is not
@@ -36,9 +36,9 @@ keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
 # Path to the permissioning certificate
-permissioningCertPath: "../keys/cmix.rip.crt"
+schedulingCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-serverCertPath: "../keys/cmix.rip.crt"
+cmixCertPath: "../keys/cmix.rip.crt"
 
 knownRoundsPath: "results/gateways/knownrounds-1.json"
 lastUpdateIdPath: "results/gateways/lastupdateid-1.txt"
diff --git a/smokeinfra/gateway-2.yaml b/smokeinfra/gateway-2.yaml
index 872f473..55d7de5 100644
--- a/smokeinfra/gateway-2.yaml
+++ b/smokeinfra/gateway-2.yaml
@@ -12,7 +12,7 @@ log: "results/gatway-2.log"
 logLevel: 2
 
 # The public IP address and port of the node associated with this gateway
-nodeAddress: "127.0.0.1:60001"
+cmixAddress: "127.0.0.1:60001"
 
 # The public IPv4 address of the Gateway, as reported to the network, to use
 # instead of dynamically looking up Gateway's own IP address. If a port is not
@@ -36,9 +36,9 @@ keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
 # Path to the permissioning certificate
-permissioningCertPath: "../keys/cmix.rip.crt"
+schedulingCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-serverCertPath: "../keys/cmix.rip.crt"
+cmixCertPath: "../keys/cmix.rip.crt"
 
 knownRoundsPath: "results/gateways/knownrounds-2.json"
 lastUpdateIdPath: "results/gateways/lastupdateid-2.txt"
diff --git a/smokeinfra/gateway-3.yaml b/smokeinfra/gateway-3.yaml
index 0b014d7..2fb8822 100644
--- a/smokeinfra/gateway-3.yaml
+++ b/smokeinfra/gateway-3.yaml
@@ -12,7 +12,7 @@ log: "results/gatway-3.log"
 logLevel: 2
 
 # The public IP address and port of the node associated with this gateway
-nodeAddress: "127.0.0.1:60002"
+cmixAddress: "127.0.0.1:60002"
 
 # The public IPv4 address of the Gateway, as reported to the network, to use
 # instead of dynamically looking up Gateway's own IP address. If a port is not
@@ -36,9 +36,9 @@ keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
 # Path to the permissioning certificate
-permissioningCertPath: "../keys/cmix.rip.crt"
+schedulingCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-serverCertPath: "../keys/cmix.rip.crt"
+cmixCertPath: "../keys/cmix.rip.crt"
 
 knownRoundsPath: "results/gateways/knownrounds-3.json"
 lastUpdateIdPath: "results/gateways/lastupdateid-3.txt"
diff --git a/smokeinfra/server-1.yaml b/smokeinfra/server-1.yaml
index d028aed..b9e5757 100644
--- a/smokeinfra/server-1.yaml
+++ b/smokeinfra/server-1.yaml
@@ -8,7 +8,7 @@
 registrationCode: "qpol"
 useGPU: false
 devMode: true
-node:
+cmix:
     paths:
         idf:  "nodeID-1.json"
         cert: "../keys/cmix.rip.crt"
@@ -26,7 +26,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-permissioning:
+scheduling:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
diff --git a/smokeinfra/server-2.yaml b/smokeinfra/server-2.yaml
index 474cdac..0e43411 100644
--- a/smokeinfra/server-2.yaml
+++ b/smokeinfra/server-2.yaml
@@ -8,7 +8,7 @@
 registrationCode: "yiiq"
 useGPU: false
 devMode: true
-node:
+cmix:
     paths:
         idf:  "nodeID-2.json"
         cert: "../keys/cmix.rip.crt"
@@ -26,7 +26,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-permissioning:
+scheduling:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
diff --git a/smokeinfra/server-3.yaml b/smokeinfra/server-3.yaml
index d987ea5..ed59ed9 100644
--- a/smokeinfra/server-3.yaml
+++ b/smokeinfra/server-3.yaml
@@ -8,7 +8,7 @@
 registrationCode: "vydz"
 useGPU: false
 devMode: true
-node:
+cmix:
     paths:
         idf:  "nodeID-3.json"
         cert: "../keys/cmix.rip.crt"
@@ -26,7 +26,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-permissioning:
+scheduling:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
-- 
GitLab