mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
fix merging errors
This commit is contained in:
parent
0ac2a4d2c8
commit
d0d84af7ee
@ -4,6 +4,7 @@ CONFIG_VERSION=v11.2022-10-27
|
||||
PORT=4000
|
||||
JWT_SECRET=secret123
|
||||
JWT_EXPIRES_IN=10m
|
||||
GRAPHIQL=false
|
||||
GDT_API_URL=https://gdt.gradido.net
|
||||
|
||||
# Database
|
||||
|
||||
@ -11,7 +11,6 @@ Decimal.set({
|
||||
|
||||
const constants = {
|
||||
DB_VERSION: '0051-add_delete_by_to_contributions',
|
||||
DECAY_START_TIME: new Date('2021-05-13 17:46:31'), // GMT+0
|
||||
DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
|
||||
LOG4JS_CONFIG: 'log4js-config.json',
|
||||
// default log level on production should be info
|
||||
@ -117,11 +116,6 @@ if (
|
||||
)
|
||||
}
|
||||
|
||||
const eventProtocol = {
|
||||
// global switch to enable writing of EventProtocol-Entries
|
||||
EVENT_PROTOCOL_DISABLED: process.env.EVENT_PROTOCOL_DISABLED === 'true' || false,
|
||||
}
|
||||
|
||||
const federation = {
|
||||
DHT_TOPIC: process.env.DHT_TOPIC || null,
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user