From c2cd2044a566dd7d432856e5152be3ba66cd8b8a Mon Sep 17 00:00:00 2001
From: Josh Brooks <josh@elixxir.io>
Date: Thu, 15 Jul 2021 22:15:29 +0000
Subject: [PATCH] Revert "Merge branch 'feature/jono/yamlUpdate' into
 'release'"

This reverts merge request !130
---
 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 7b66bb1..68f4d55 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
-cmixAddress: "127.0.0.1:50000"
+nodeAddress: "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
-schedulingCertPath: "../keys/cmix.rip.crt"
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-cmixCertPath: "../keys/cmix.rip.crt"
+serverCertPath: "../keys/cmix.rip.crt"
 
 devMode: true
 
diff --git a/basice2e/gateway-2.yaml b/basice2e/gateway-2.yaml
index 7ea7802..d01a93f 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
-cmixAddress: "127.0.0.1:50001"
+nodeAddress: "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
-schedulingCertPath: "../keys/cmix.rip.crt"
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-cmixCertPath: "../keys/cmix.rip.crt"
+serverCertPath: "../keys/cmix.rip.crt"
 
 devMode: true
 
diff --git a/basice2e/gateway-3.yaml b/basice2e/gateway-3.yaml
index 406c15c..954dbef 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
-cmixAddress: "127.0.0.1:50002"
+nodeAddress: "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
-schedulingCertPath: "../keys/cmix.rip.crt"
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-cmixCertPath: "../keys/cmix.rip.crt"
+serverCertPath: "../keys/cmix.rip.crt"
 
 devMode: true
 
diff --git a/basice2e/gateway-4.yaml b/basice2e/gateway-4.yaml
index a72048f..8a2e2d1 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
-cmixAddress: "127.0.0.1:50003"
+nodeAddress: "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
-schedulingCertPath: "../keys/cmix.rip.crt"
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-cmixCertPath: "../keys/cmix.rip.crt"
+serverCertPath: "../keys/cmix.rip.crt"
 
 devMode: true
 
diff --git a/basice2e/gateway-5.yaml b/basice2e/gateway-5.yaml
index 353dc07..079566e 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
-cmixAddress: "127.0.0.1:50004"
+nodeAddress: "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
-schedulingCertPath: "../keys/cmix.rip.crt"
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-cmixCertPath: "../keys/cmix.rip.crt"
+serverCertPath: "../keys/cmix.rip.crt"
 
 devMode: true
 
diff --git a/basice2e/server-1.yaml b/basice2e/server-1.yaml
index 0315dc8..d920328 100644
--- a/basice2e/server-1.yaml
+++ b/basice2e/server-1.yaml
@@ -9,7 +9,7 @@ registrationCode: "qpol"
 useGPU: false
 devMode: true
 logLevel: 1
-cmix:
+node:
     paths:
         idf:  "results/servers/nodeID-1.json"
         cert: "../keys/cmix.rip.crt"
@@ -27,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-scheduling:
+permissioning:
   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 46cc443..9a7c110 100644
--- a/basice2e/server-2.yaml
+++ b/basice2e/server-2.yaml
@@ -9,7 +9,7 @@ registrationCode: "yiiq"
 useGPU: false
 devMode: true
 logLevel: 1
-cmix:
+node:
     paths:
         idf:  "results/servers/nodeID-2.json"
         cert: "../keys/cmix.rip.crt"
@@ -27,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-scheduling:
+permissioning:
   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 2a21560..0935874 100644
--- a/basice2e/server-3.yaml
+++ b/basice2e/server-3.yaml
@@ -9,7 +9,7 @@ registrationCode: "vydz"
 useGPU: false
 devMode: true
 logLevel: 1
-cmix:
+node:
     paths:
         idf:  "results/servers/nodeID-3.json"
         cert: "../keys/cmix.rip.crt"
@@ -27,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-scheduling:
+permissioning:
   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 4610724..7f32cae 100644
--- a/basice2e/server-4.yaml
+++ b/basice2e/server-4.yaml
@@ -9,7 +9,7 @@ registrationCode: "gwxs"
 useGPU: false
 devMode: true
 logLevel: 1
-cmix:
+node:
     paths:
         idf:  "results/servers/nodeID-4.json"
         cert: "../keys/cmix.rip.crt"
@@ -27,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-scheduling:
+permissioning:
   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 42ac921..494f901 100644
--- a/basice2e/server-5.yaml
+++ b/basice2e/server-5.yaml
@@ -9,7 +9,7 @@ registrationCode: "nahv"
 useGPU: false
 devMode: true
 logLevel: 1
-cmix:
+node:
     paths:
         idf:  "results/servers/nodeID-5.json"
         cert: "../keys/cmix.rip.crt"
@@ -27,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-scheduling:
+permissioning:
   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 a305d5a..259c700 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
-cmixAddress: "127.0.0.1:60000"
+nodeAddress: "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
-schedulingCertPath: "../keys/cmix.rip.crt"
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-cmixCertPath: "../keys/cmix.rip.crt"
+serverCertPath: "../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 55d7de5..872f473 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
-cmixAddress: "127.0.0.1:60001"
+nodeAddress: "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
-schedulingCertPath: "../keys/cmix.rip.crt"
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-cmixCertPath: "../keys/cmix.rip.crt"
+serverCertPath: "../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 2fb8822..0b014d7 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
-cmixAddress: "127.0.0.1:60002"
+nodeAddress: "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
-schedulingCertPath: "../keys/cmix.rip.crt"
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-cmixCertPath: "../keys/cmix.rip.crt"
+serverCertPath: "../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 b9e5757..d028aed 100644
--- a/smokeinfra/server-1.yaml
+++ b/smokeinfra/server-1.yaml
@@ -8,7 +8,7 @@
 registrationCode: "qpol"
 useGPU: false
 devMode: true
-cmix:
+node:
     paths:
         idf:  "nodeID-1.json"
         cert: "../keys/cmix.rip.crt"
@@ -26,7 +26,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-scheduling:
+permissioning:
   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 0e43411..474cdac 100644
--- a/smokeinfra/server-2.yaml
+++ b/smokeinfra/server-2.yaml
@@ -8,7 +8,7 @@
 registrationCode: "yiiq"
 useGPU: false
 devMode: true
-cmix:
+node:
     paths:
         idf:  "nodeID-2.json"
         cert: "../keys/cmix.rip.crt"
@@ -26,7 +26,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-scheduling:
+permissioning:
   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 ed59ed9..d987ea5 100644
--- a/smokeinfra/server-3.yaml
+++ b/smokeinfra/server-3.yaml
@@ -8,7 +8,7 @@
 registrationCode: "vydz"
 useGPU: false
 devMode: true
-cmix:
+node:
     paths:
         idf:  "nodeID-3.json"
         cert: "../keys/cmix.rip.crt"
@@ -26,7 +26,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-scheduling:
+permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
-- 
GitLab