From 6838092a503fbeadfe4d2b2c2a52b2de43540fa5 Mon Sep 17 00:00:00 2001
From: Denis Kirillov <d.kirillov@yadro.com>
Date: Wed, 21 Dec 2022 14:39:29 +0300
Subject: [PATCH] [TrueCloudLab#1] Use frostfs gates

Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
---
 .env                                  | 12 ++++++------
 services/http_gate/.http.env          |  2 +-
 services/rest_gate/docker-compose.yml | 10 +++++-----
 services/s3_gate/docker-compose.yml   |  6 +++---
 services/s3_gate/wallet.json          |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.env b/.env
index 550e5b7..01ecbc3 100644
--- a/.env
+++ b/.env
@@ -26,16 +26,16 @@ NATS_VERSION=2.7.2
 NATS_IMAGE=nats
 
 # HTTP Gate
-HTTP_GW_VERSION=0.25.0
-HTTP_GW_IMAGE=nspccdev/neofs-http-gw
+HTTP_GW_VERSION=6abd500b
+HTTP_GW_IMAGE=truecloudlab/frostfs-http-gw
 
 # REST Gate
-REST_GW_VERSION=0.4.0
-REST_GW_IMAGE=nspccdev/neofs-rest-gw
+REST_GW_VERSION=c9c85e90
+REST_GW_IMAGE=truecloudlab/frostfs-rest-gw
 
 # S3 Gate
-S3_GW_VERSION=0.25.0
-S3_GW_IMAGE=nspccdev/neofs-s3-gw
+S3_GW_VERSION=000d9ed4
+S3_GW_IMAGE=truecloudlab/frostfs-s3-gw
 
 # Coredns
 COREDNS_VERSION=v016
diff --git a/services/http_gate/.http.env b/services/http_gate/.http.env
index 97f6312..3e1b0dd 100644
--- a/services/http_gate/.http.env
+++ b/services/http_gate/.http.env
@@ -1,4 +1,4 @@
-HTTP_GW_LISTEN_ADDRESS=0.0.0.0:80
+HTTP_GW_SERVER_0_ADDRESS=0.0.0.0:80
 
 HTTP_GW_LOGGER_LEVEL=info
 
diff --git a/services/rest_gate/docker-compose.yml b/services/rest_gate/docker-compose.yml
index 75b0b7a..478d25b 100644
--- a/services/rest_gate/docker-compose.yml
+++ b/services/rest_gate/docker-compose.yml
@@ -20,11 +20,11 @@ services:
     environment:
       - REST_GW_WALLET_PATH=/wallet.json
       - REST_GW_WALLET_PASSPHRASE=one
-      - REST_GW_LISTEN_ADDRESS=0.0.0.0:8090
-      - REST_GW_PEERS_0_ADDRESS=s01.${LOCAL_DOMAIN}:8080
-      - REST_GW_PEERS_1_ADDRESS=s02.${LOCAL_DOMAIN}:8080
-      - REST_GW_PEERS_2_ADDRESS=s03.${LOCAL_DOMAIN}:8080
-      - REST_GW_PEERS_3_ADDRESS=s04.${LOCAL_DOMAIN}:8080
+      - REST_GW_SERVER_LISTEN_ADDRESS=0.0.0.0:8090
+      - REST_GW_POOL_PEERS_0_ADDRESS=s01.${LOCAL_DOMAIN}:8080
+      - REST_GW_POOL_PEERS_1_ADDRESS=s02.${LOCAL_DOMAIN}:8080
+      - REST_GW_POOL_PEERS_2_ADDRESS=s03.${LOCAL_DOMAIN}:8080
+      - REST_GW_POOL_PEERS_3_ADDRESS=s04.${LOCAL_DOMAIN}:8080
 
 networks:
   rest_gate_int:
diff --git a/services/s3_gate/docker-compose.yml b/services/s3_gate/docker-compose.yml
index 82efcaa..8cce4ff 100644
--- a/services/s3_gate/docker-compose.yml
+++ b/services/s3_gate/docker-compose.yml
@@ -24,9 +24,9 @@ services:
     environment:
       - S3_GW_WALLET_PATH=/wallet.json
       - S3_GW_WALLET_PASSPHRASE=s3
-      - S3_GW_TLS_KEY_FILE=/tls.key
-      - S3_GW_TLS_CERT_FILE=/tls.crt
-      - S3_GW_LISTEN_ADDRESS=s3.${LOCAL_DOMAIN}:8080
+      - S3_GW_SERVER_0_TLS_KEY_FILE=/tls.key
+      - S3_GW_SERVER_0_TLS_CERT_FILE=/tls.crt
+      - S3_GW_SERVER_0_ADDRESS=s3.${LOCAL_DOMAIN}:8080
       - S3_GW_LISTEN_DOMAINS=s3.${LOCAL_DOMAIN}
       - S3_GW_TREE_SERVICE=s01.${LOCAL_DOMAIN}:8080
       - S3_GW_PEERS_0_ADDRESS=s01.${LOCAL_DOMAIN}:8080
diff --git a/services/s3_gate/wallet.json b/services/s3_gate/wallet.json
index 8d3d4c2..ff1adfd 100644
--- a/services/s3_gate/wallet.json
+++ b/services/s3_gate/wallet.json
@@ -5,7 +5,7 @@
     {
       "address": "NUUb82KR2JrVByHs2YSKgtK29gKnF5q6Vt",
       "key": "6PYSPET41jKtqie2cfkqgy7q9ueeucH8bX9Gotm2HwdNEDptj6aBe8dDg8",
-      "label": "NeoFS S3 Gate",
+      "label": "FrostFS S3 Gate",
       "contract": {
         "script": "DCEDE7GsOoB24VWn55eyTwtlDMytWUHqWdfP1RoCSosqBr9BVuezJw==",
         "parameters": [