diff --git a/.env b/.env index 4fa3839..47987c9 100644 --- a/.env +++ b/.env @@ -35,10 +35,6 @@ REST_GW_IMAGE=truecloudlab/frostfs-rest-gw S3_GW_VERSION=000d9ed4 S3_GW_IMAGE=truecloudlab/frostfs-s3-gw -# Coredns -COREDNS_VERSION=v016 -COREDNS_IMAGE=nspccdev/coredns - # FrostFS LOCODE database LOCODE_DB_URL=https://github.com/nspcc-dev/neofs-locode-db/releases/download/v0.3.0/locode_db.gz #LOCODE_DB_PATH=/path/to/locode_db diff --git a/.services b/.services index 19b229e..d9f34c7 100644 --- a/.services +++ b/.services @@ -3,4 +3,3 @@ http_gate s3_gate rest_gate -coredns diff --git a/services/coredns/.env b/services/coredns/.env deleted file mode 120000 index c7360fb..0000000 --- a/services/coredns/.env +++ /dev/null @@ -1 +0,0 @@ -../../.env \ No newline at end of file diff --git a/services/coredns/.hosts b/services/coredns/.hosts deleted file mode 100644 index 5f77ce9..0000000 --- a/services/coredns/.hosts +++ /dev/null @@ -1 +0,0 @@ -IPV4_PREFIX.53 coredns.LOCAL_DOMAIN diff --git a/services/coredns/.int_test.env b/services/coredns/.int_test.env deleted file mode 120000 index 582b6a2..0000000 --- a/services/coredns/.int_test.env +++ /dev/null @@ -1 +0,0 @@ -../../.int_test.env \ No newline at end of file diff --git a/services/coredns/Corefile b/services/coredns/Corefile deleted file mode 100644 index 852c758..0000000 --- a/services/coredns/Corefile +++ /dev/null @@ -1,8 +0,0 @@ -. { - nns http://192.168.130.90:30333 - transfer { - to * - } - log - debug -} diff --git a/services/coredns/docker-compose.yml b/services/coredns/docker-compose.yml deleted file mode 100644 index a65854d..0000000 --- a/services/coredns/docker-compose.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- - -version: "2.4" -services: - neofs_coredns: - image: ${COREDNS_IMAGE}:${COREDNS_VERSION} - container_name: coredns - domainname: ${LOCAL_DOMAIN} - hostname: coredns - networks: - coredns: - internet: - ipv4_address: ${IPV4_PREFIX}.53 - stop_signal: SIGKILL - env_file: [ ".int_test.env" ] - volumes: - - ./Corefile:/Corefile - - ./../../vendor/hosts:/etc/hosts - -networks: - coredns: - internet: - external: true - name: basenet_internet diff --git a/services/http_gate/.http.env b/services/http_gate/.http.env index 3e1b0dd..efef237 100644 --- a/services/http_gate/.http.env +++ b/services/http_gate/.http.env @@ -6,4 +6,4 @@ HTTP_GW_REBALANCE_TIMER=5m HTTP_GW_CONNECT_TIMEOUT=60s HTTP_GW_REQUEST_TIMEOUT=300s -HTTP_GW_RESOLVE_ORDER=dns +HTTP_GW_RESOLVE_ORDER=nns diff --git a/services/http_gate/docker-compose.yml b/services/http_gate/docker-compose.yml index 1e822c8..d7f9c76 100644 --- a/services/http_gate/docker-compose.yml +++ b/services/http_gate/docker-compose.yml @@ -8,8 +8,6 @@ services: hostname: http_gate container_name: http_gate restart: on-failure - dns: - - ${IPV4_PREFIX}.53 networks: http_gate_int: internet: @@ -22,6 +20,7 @@ services: environment: - HTTP_GW_WALLET_PATH=/wallet.json - HTTP_GW_WALLET_PASSPHRASE=one + - HTTP_GW_RPC_ENDPOINT=http://morph-chain.${LOCAL_DOMAIN}:30333 - HTTP_GW_PEERS_0_ADDRESS=s01.${LOCAL_DOMAIN}:8080 - HTTP_GW_PEERS_0_WEIGHT=0.2 - HTTP_GW_PEERS_1_ADDRESS=s02.${LOCAL_DOMAIN}:8080 diff --git a/services/s3_gate/.s3.env b/services/s3_gate/.s3.env index 039939d..e89578a 100644 --- a/services/s3_gate/.s3.env +++ b/services/s3_gate/.s3.env @@ -6,3 +6,5 @@ S3_GW_LOGGER_LEVEL=debug S3_GW_MAX_CLIENTS_COUNT=100 S3_GW_MAX_CLIENTS_DEADLINE=30s + +S3_GW_RESOLVE_ORDER=nns diff --git a/services/s3_gate/docker-compose.yml b/services/s3_gate/docker-compose.yml index 8cce4ff..8dd9606 100644 --- a/services/s3_gate/docker-compose.yml +++ b/services/s3_gate/docker-compose.yml @@ -8,8 +8,6 @@ services: hostname: s3_gate container_name: s3_gate restart: on-failure - dns: - - ${IPV4_PREFIX}.53 networks: s3_gate_int: internet: @@ -24,6 +22,7 @@ services: environment: - S3_GW_WALLET_PATH=/wallet.json - S3_GW_WALLET_PASSPHRASE=s3 + - S3_GW_RPC_ENDPOINT=http://morph-chain.${LOCAL_DOMAIN}:30333 - 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