From 74ccc1b2220aecf4341f4fb8a5a8681146f9c810 Mon Sep 17 00:00:00 2001
From: anastasia prasolova <anastasia@nspcc.ru>
Date: Fri, 9 Jul 2021 11:22:01 +0300
Subject: [PATCH] move s04 tls keys configuration from .storage.env to compose
 file

Signed-off-by: anastasia prasolova <anastasia@nspcc.ru>
---
 services/storage/.storage.env       | 8 ++------
 services/storage/docker-compose.yml | 4 +++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/services/storage/.storage.env b/services/storage/.storage.env
index ca71b60..26551d9 100644
--- a/services/storage/.storage.env
+++ b/services/storage/.storage.env
@@ -21,10 +21,6 @@ NEOFS_METRICS_ADDRESS=:9090
 
 # GRPC Transport Section
 NEOFS_GRPC_NUM=1
-## 0 server
-### TLS config
-NEOFS_GRPC_0_TLS_CERTIFICATE=/tls.crt
-NEOFS_GRPC_0_TLS_KEY=/tls.key
 
 # Morph section
 ## Endpoints of sidechain RPC nodes (comma-separated)
@@ -51,7 +47,7 @@ NEOFS_MAINCHAIN_RPC_ENDPOINT=http://morph_chain:30333
 #NEOFS_APICLIENT_DIAL_TIMEOUT=1m
 
 # Contracts section.
-## Adresses of sidechain contracts. 
+## Adresses of sidechain contracts.
 ## Defaults: empty (invalid)
 NEOFS_CONTRACTS_BALANCE=d8f5cadd51d34602c751ef673496e7e5b615f223
 NEOFS_CONTRACTS_CONTAINER=c241ae468ad95af029408e1845226d7771c7c60f
@@ -95,7 +91,7 @@ NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_SHALLOW_DEPTH=2
 NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_SHALLOW_WIDTH=4
 NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_OPENED_CACHE_SIZE=50
 ### GC config
-#### Limit of the single data remover's batching operation in number of objects 
+#### Limit of the single data remover's batching operation in number of objects
 NEOFS_STORAGE_SHARD_0_GC_REMOVER_BATCH_SIZE=100
 #### Sleep interval between data remover tacts
 NEOFS_STORAGE_SHARD_0_GC_REMOVER_SLEEP_INTERVAL=1m
diff --git a/services/storage/docker-compose.yml b/services/storage/docker-compose.yml
index 2fb27e5..c53d8ca 100644
--- a/services/storage/docker-compose.yml
+++ b/services/storage/docker-compose.yml
@@ -129,6 +129,8 @@ services:
       - NEOFS_GRPC_0_ENDPOINT=s04.${LOCAL_DOMAIN}:8080
       - NEOFS_GRPC_1_ENDPOINT=s04.${LOCAL_DOMAIN}:8082
       - NEOFS_GRPC_1_TLS_ENABLED=true
+      - NEOFS_GRPC_1_TLS_CERTIFICATE=/tls.crt
+      - NEOFS_GRPC_1_TLS_KEY=/tls.key
       - NEOFS_NODE_ATTRIBUTE_0=UN-LOCODE:FI HEL
       - NEOFS_NODE_ATTRIBUTE_1=Price:44
     healthcheck:
@@ -137,7 +139,7 @@ services:
       timeout: 1s
       retries: 5
       start_period: 10s
-     
+
   sn-healthcheck:
     container_name: sn-healthcheck
     image: debian:10