diff --git a/.env.devnet b/.env.devnet index 5b6e1a2..162596d 100644 --- a/.env.devnet +++ b/.env.devnet @@ -1,2 +1,10 @@ NETWORK=devnet API_URL=https://devnet-api.multiversx.com + +DATABASE_HOST=mongodb://localhost:27017 +DATABASE_NAME=template +DATABASE_USERNAME= +DATABASE_PASSWORD= + +REDIS_HOST=localhost +REDIS_PORT=6379 diff --git a/.env.mainnet b/.env.mainnet index 2605950..b85192e 100644 --- a/.env.mainnet +++ b/.env.mainnet @@ -1,2 +1,10 @@ NETWORK=mainnet API_URL=https://api.multiversx.com + +DATABASE_HOST=mongodb://localhost:27017 +DATABASE_NAME=template +DATABASE_USERNAME= +DATABASE_PASSWORD= + +REDIS_HOST=localhost +REDIS_PORT=6379 diff --git a/.env.testnet b/.env.testnet index 3af46c9..f1f3008 100644 --- a/.env.testnet +++ b/.env.testnet @@ -1,2 +1,10 @@ NETWORK=testnet API_URL=https://testnet-api.multiversx.com + +DATABASE_HOST=mongodb://localhost:27017 +DATABASE_NAME=template +DATABASE_USERNAME= +DATABASE_PASSWORD= + +REDIS_HOST=localhost +REDIS_PORT=6379 diff --git a/.multiversx/config/.env.example b/.multiversx/config/.env.example index dd0c381..1fa2024 100644 --- a/.multiversx/config/.env.example +++ b/.multiversx/config/.env.example @@ -1,3 +1,11 @@ NODE_ENV=infra NETWORK= API_URL= + +DATABASE_HOST=mongodb://localhost:27017 +DATABASE_NAME=template +DATABASE_USERNAME= +DATABASE_PASSWORD= + +REDIS_HOST=localhost +REDIS_PORT=6379 diff --git a/.multiversx/config/config.yaml b/.multiversx/config/config.yaml index 3a661d0..cc4a8a5 100644 --- a/.multiversx/config/config.yaml +++ b/.multiversx/config/config.yaml @@ -16,15 +16,14 @@ libs: urls: api: ${API_URL} database: - host: 'localhost' - port: 27017 - # username: 'root' - # password: 'root' - name: 'example' + host: ${DATABASE_HOST} + username: ${DATABASE_USERNAME} + password: ${DATABASE_PASSWORD} + name: ${DATABASE_NAME} tlsAllowInvalidCertificates: true redis: - host: '127.0.0.1' - port: 6379 + host: ${REDIS_HOST} + port: ${num:REDIS_PORT} nativeAuth: # maxExpirySeconds: acceptedOrigins: diff --git a/config/config.yaml b/config/config.yaml index 3a661d0..cc4a8a5 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -16,15 +16,14 @@ libs: urls: api: ${API_URL} database: - host: 'localhost' - port: 27017 - # username: 'root' - # password: 'root' - name: 'example' + host: ${DATABASE_HOST} + username: ${DATABASE_USERNAME} + password: ${DATABASE_PASSWORD} + name: ${DATABASE_NAME} tlsAllowInvalidCertificates: true redis: - host: '127.0.0.1' - port: 6379 + host: ${REDIS_HOST} + port: ${num:REDIS_PORT} nativeAuth: # maxExpirySeconds: acceptedOrigins: diff --git a/config/schema.yaml b/config/schema.yaml index d26206d..493e4d2 100644 --- a/config/schema.yaml +++ b/config/schema.yaml @@ -20,7 +20,6 @@ libs: api: string database: host: string - port: integer username: type: string required: false diff --git a/libs/common/src/entities/config.d.ts b/libs/common/src/entities/config.d.ts index e169e47..e22cb55 100644 --- a/libs/common/src/entities/config.d.ts +++ b/libs/common/src/entities/config.d.ts @@ -26,7 +26,6 @@ export interface Config { }; database: { host: string; - port: number; username?: string; password?: string; name: string; diff --git a/libs/database/src/database.module.ts b/libs/database/src/database.module.ts index 294821c..1497528 100644 --- a/libs/database/src/database.module.ts +++ b/libs/database/src/database.module.ts @@ -10,7 +10,7 @@ import { UserRepository } from './repositories'; MongooseModule.forRootAsync({ imports: [CommonConfigModule], useFactory: (configService: CommonConfigService) => ({ - uri: `mongodb://${configService.config.database.host}:${configService.config.database.port}`, + uri: configService.config.database.host, dbName: configService.config.database.name, user: configService.config.database.username, pass: configService.config.database.password,