diff --git a/.env b/.env index e96c8b6b2..44c1ec3a5 100644 --- a/.env +++ b/.env @@ -3,14 +3,15 @@ COMPOSE_PROJECT_NAME=ghostfolio-development # CACHE REDIS_HOST=localhost REDIS_PORT=6379 +REDIS_PASSWORD= # POSTGRES POSTGRES_DB=ghostfolio-db POSTGRES_USER=user -POSTGRES_PASSWORD=password +POSTGRES_PASSWORD= -ACCESS_TOKEN_SALT=GHOSTFOLIO +ACCESS_TOKEN_SALT= ALPHA_VANTAGE_API_KEY= DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=prefer -JWT_SECRET_KEY=123456 +JWT_SECRET_KEY= PORT=3333 diff --git a/CHANGELOG.md b/CHANGELOG.md index cbce39f80..040b771a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added `EOD_HISTORICAL_DATA` as a new data source type +### Changed + +- Exposed the environment variable `REDIS_PASSWORD` + ### Todo - Apply data migration (`yarn database:migrate`) diff --git a/apps/api/src/app/app.module.ts b/apps/api/src/app/app.module.ts index f95c93fd2..f1fc27976 100644 --- a/apps/api/src/app/app.module.ts +++ b/apps/api/src/app/app.module.ts @@ -42,7 +42,8 @@ import { UserModule } from './user/user.module'; BullModule.forRoot({ redis: { host: process.env.REDIS_HOST, - port: parseInt(process.env.REDIS_PORT, 10) + port: parseInt(process.env.REDIS_PORT, 10), + password: process.env.REDIS_PASSWORD } }), CacheModule, diff --git a/apps/api/src/app/redis-cache/redis-cache.module.ts b/apps/api/src/app/redis-cache/redis-cache.module.ts index dcda94041..96cf50325 100644 --- a/apps/api/src/app/redis-cache/redis-cache.module.ts +++ b/apps/api/src/app/redis-cache/redis-cache.module.ts @@ -14,6 +14,7 @@ import { RedisCacheService } from './redis-cache.service'; useFactory: async (configurationService: ConfigurationService) => ({ host: configurationService.get('REDIS_HOST'), max: configurationService.get('MAX_ITEM_IN_CACHE'), + password: configurationService.get('REDIS_PASSWORD'), port: configurationService.get('REDIS_PORT'), store: redisStore, ttl: configurationService.get('CACHE_TTL') diff --git a/apps/api/src/services/configuration.service.ts b/apps/api/src/services/configuration.service.ts index e7d71a7e2..525951a70 100644 --- a/apps/api/src/services/configuration.service.ts +++ b/apps/api/src/services/configuration.service.ts @@ -37,6 +37,7 @@ export class ConfigurationService { PORT: port({ default: 3333 }), RAKUTEN_RAPID_API_KEY: str({ default: '' }), REDIS_HOST: str({ default: 'localhost' }), + REDIS_PASSWORD: str({ default: '' }), REDIS_PORT: port({ default: 6379 }), ROOT_URL: str({ default: 'http://localhost:4200' }), STRIPE_PUBLIC_KEY: str({ default: '' }), diff --git a/apps/api/src/services/interfaces/environment.interface.ts b/apps/api/src/services/interfaces/environment.interface.ts index 3d4e25c54..36e9c7261 100644 --- a/apps/api/src/services/interfaces/environment.interface.ts +++ b/apps/api/src/services/interfaces/environment.interface.ts @@ -28,6 +28,7 @@ export interface Environment extends CleanedEnvAccessors { PORT: number; RAKUTEN_RAPID_API_KEY: string; REDIS_HOST: string; + REDIS_PASSWORD: string; REDIS_PORT: number; ROOT_URL: string; STRIPE_PUBLIC_KEY: string; diff --git a/docker/docker-compose.build.yml b/docker/docker-compose.build.yml index 1d2496f9b..37f63d8c8 100644 --- a/docker/docker-compose.build.yml +++ b/docker/docker-compose.build.yml @@ -7,6 +7,7 @@ services: environment: DATABASE_URL: postgresql://user:password@postgres:5432/ghostfolio-db?sslmode=prefer REDIS_HOST: 'redis' + REDIS_PASSWORD: ${REDIS_PASSWORD} ports: - 3333:3333 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 7afd19a19..786f62f55 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -7,6 +7,7 @@ services: environment: DATABASE_URL: postgresql://user:password@postgres:5432/ghostfolio-db?sslmode=prefer REDIS_HOST: 'redis' + REDIS_PASSWORD: ${REDIS_PASSWORD} ports: - 3333:3333