From bd5d7dff3657a883edfa6502ad3b9e16c654498d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= Date: Thu, 2 Feb 2023 22:27:59 +0100 Subject: [PATCH] remove unused federation config properties --- backend/.env.dist | 9 ++------- backend/.env.template | 5 +---- backend/src/config/index.ts | 10 +--------- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/backend/.env.dist b/backend/.env.dist index 365cf5e5f..a72ba2021 100644 --- a/backend/.env.dist +++ b/backend/.env.dist @@ -1,4 +1,4 @@ -CONFIG_VERSION=v14.2022-12-22 +CONFIG_VERSION=v16.2023-02-02 # Server PORT=4000 @@ -63,9 +63,4 @@ EVENT_PROTOCOL_DISABLED=false # LOG_LEVEL=info # Federation -# if you set the value of FEDERATION_DHT_TOPIC, the DHT hyperswarm will start to announce and listen -# on an hash created from this topic -# FEDERATION_DHT_TOPIC=GRADIDO_HUB -# FEDERATION_DHT_SEED=64ebcb0e3ad547848fef4197c6e2332f -# FEDERATION_COMMUNITY_URL=http://localhost:4000/api -# FEDERATION_VALIDATE_COMMUNITY_TIMER=60000 \ No newline at end of file +FEDERATION_VALIDATE_COMMUNITY_TIMER=60000 \ No newline at end of file diff --git a/backend/.env.template b/backend/.env.template index b2c47d340..2e2aaf9aa 100644 --- a/backend/.env.template +++ b/backend/.env.template @@ -58,7 +58,4 @@ WEBHOOK_ELOPAGE_SECRET=$WEBHOOK_ELOPAGE_SECRET EVENT_PROTOCOL_DISABLED=$EVENT_PROTOCOL_DISABLED # Federation -FEDERATION_DHT_TOPIC=$FEDERATION_DHT_TOPIC -FEDERATION_DHT_SEED=$FEDERATION_DHT_SEED -FEDERATION_COMMUNITY_URL=$FEDERATION_COMMUNITY_URL -FEDERATION_VALIDATE_COMMUNITY_TIMER=$FEDERATION_VALIDATE_COMMUNITY_TIMER \ No newline at end of file +FEDERATION_VALIDATE_COMMUNITY_TIMER=$FEDERATION_VALIDATE_COMMUNITY_TIMER diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index a680253f3..16d29539f 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -17,7 +17,7 @@ const constants = { LOG_LEVEL: process.env.LOG_LEVEL || 'info', CONFIG_VERSION: { DEFAULT: 'DEFAULT', - EXPECTED: 'v15.2023-01-03', + EXPECTED: 'v16.2023-02-02', CURRENT: '', }, } @@ -120,14 +120,6 @@ if ( } const federation = { - FEDERATION_DHT_TOPIC: process.env.FEDERATION_DHT_TOPIC || null, - FEDERATION_DHT_SEED: process.env.FEDERATION_DHT_SEED || null, - FEDERATION_COMMUNITY_URL: - process.env.FEDERATION_COMMUNITY_URL === undefined - ? null - : process.env.FEDERATION_COMMUNITY_URL.endsWith('/') - ? process.env.FEDERATION_COMMUNITY_URL - : process.env.FEDERATION_COMMUNITY_URL + '/', FEDERATION_VALIDATE_COMMUNITY_TIMER: process.env.FEDERATION_VALIDATE_COMMUNITY_TIMER || 60000, }