IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
Claus-Peter Hübner 2022-11-25 03:09:54 +01:00
parent 7543acfb53
commit efa46f50f3
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/.env.dist
View File

@ -62,11 +62,7 @@ EVENT_PROTOCOL_DISABLED=false
# LOG_LEVEL=info
# Federation
<<<<<<< HEAD
# if you set the value of FEDERATION_DHT_TOPIC, the DHT hyperswarm will start to announce and listen
=======
# if you set the value of FEDERATE_DHT_TOPIC, the DHT hyperswarm will start to announce and listen
>>>>>>> 192ab67817a12f0a765caa48c0e13272b7310b25
# on an hash created from this topic
# FEDERATION_DHT_TOPIC=GRADIDO_HUB
# FEDERATION_DHT_SEED=64ebcb0e3ad547848fef4197c6e2332f

5
backend/.env.template
View File

@ -57,10 +57,5 @@ WEBHOOK_ELOPAGE_SECRET=$WEBHOOK_ELOPAGE_SECRET
EVENT_PROTOCOL_DISABLED=$EVENT_PROTOCOL_DISABLED
# Federation
<<<<<<< HEAD
FEDERATION_DHT_TOPIC=$FEDERATION_DHT_TOPIC
FEDERATION_DHT_SEED=$FEDERATION_DHT_SEED
=======
FEDERATE_DHT_TOPIC=$FEDERATE_DHT_TOPIC
FEDERATE_DHT_SEED=$FEDERATE_DHT_SEED
>>>>>>> 192ab67817a12f0a765caa48c0e13272b7310b25

1
backend/src/federation/index.ts
View File

@ -38,7 +38,6 @@ export const startDHT = async (
): Promise<void> => {
try {
const TOPIC = DHT.hash(Buffer.from(topic))
logger.debug(`getSeed='${getSeed()}'`)
const keyPair = DHT.keyPair(getSeed())
logger.info(`keyPairDHT: publicKey=${keyPair.publicKey.toString('hex')}`)
logger.debug(`keyPairDHT: secretKey=${keyPair.secretKey.toString('hex')}`)