All passwords, logins, links, and tokens have been moved to .env

Author: KirillVsMonkey

.env.example

@@ -0,0 +1,31 @@
+# PostgreSQL Configuration
+POSTGRES_DB=your_db_name
+POSTGRES_USER=your_db_user
+POSTGRES_PASSWORD=your_db_password
+POSTGRES_PORT=5432
+POSTGRES_LOCAL_PORT=5555
+
+# MongoDB Configuration
+MONGO_INITDB_ROOT_USERNAME=your_root_username
+MONGO_INITDB_ROOT_PASSWORD=your_root_password
+MONGO_INITDB_DATABASE=your_database
+MONGO_USERNAME=your_username
+MONGO_PASSWORD=your_password
+MONGO_DATABASE=your_database
+MONGO_HOST=your_mongo_host
+MONGO_PORT=27017
+MONGO_LOCAL_PORT=27018
+
+# Spring Configuration
+SPRING_DATASOURCE_URL=jdbc:postgresql://host:port/database
+SPRING_DATASOURCE_USERNAME=your_username
+SPRING_DATASOURCE_PASSWORD=your_password
+SPRING_DATASOURCE_LOCAL_URL=jdbc:postgresql://localhost:5555/database
+
+# Service URLs
+AGGREGATOR_SERVICE_URL=http://aggregation-service:8080/news
+AGGREGATOR_SERVICE_LOCAL_URL=http://localhost:8080/news
+
+# Telegram Bot Configuration (optional - default name: tnewsSubscriptionBot)
+BOT_NAME=your_bot_name
+BOT_TOKEN=your_bot_token 

.gitignore

@@ -47,3 +47,8 @@ Thumbs.db
 
 # Spring Boot specific
 spring-boot-devtools.properties
+
+# Environment variables
+.env
+.env.local
+.env.*.local

aggregation-service/src/main/resources/application.yml

@@ -1,9 +1,9 @@
 spring:
   data:
     mongodb:
-      username: user
-      password: password
-      host: localhost
-      port: 27017
-      database: newsdb
+      username: ${MONGO_USERNAME}
+      password: ${MONGO_PASSWORD}
+      host: ${MONGO_HOST:-localhost}
+      port: ${MONGO_PORT:-27017}
+      database: ${MONGO_DATABASE}
 

docker-compose.yml

@@ -1,11 +1,11 @@
-../services:
+services:
   postgres-db:
     image: postgres:latest
     container_name: tnews-db
     environment:
-      POSTGRES_DB: tnews_DB
-      POSTGRES_USER: tnews_DB
-      POSTGRES_PASSWORD: postgres_tnews_DB
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     networks:
       - internal_net
     volumes:
@@ -16,9 +16,9 @@
     container_name: mongodb_container
     restart: always
     environment:
-      MONGO_INITDB_ROOT_USERNAME: root
-      MONGO_INITDB_ROOT_PASSWORD: password
-      MONGO_INITDB_DATABASE: newsdb
+      MONGO_INITDB_ROOT_USERNAME: ${MONGO_INITDB_ROOT_USERNAME}
+      MONGO_INITDB_ROOT_PASSWORD: ${MONGO_INITDB_ROOT_PASSWORD}
+      MONGO_INITDB_DATABASE: ${MONGO_INITDB_DATABASE}
     volumes:
       - ./init-mongo.js:/docker-entrypoint-initdb.d/init-mongo.js:ro
       - mongo_data:/data/db
@@ -32,10 +32,10 @@
       - postgres-db
       - aggregation-service
     environment:
-      SPRING_DATASOURCE_URL: jdbc:postgresql://tnews-db:5432/tnews_DB
-      SPRING_DATASOURCE_USERNAME: tnews_DB
-      SPRING_DATASOURCE_PASSWORD: postgres_tnews_DB
-      AGGREGATOR_SERVICE_URL: http://aggregation-service:8080/news
+      SPRING_DATASOURCE_URL: ${SPRING_DATASOURCE_URL}
+      SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME}
+      SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD}
+      AGGREGATOR_SERVICE_URL: ${AGGREGATOR_SERVICE_URL:-http://aggregation-service:8080/news}
     networks:
       - internal_net
       - default
@@ -46,10 +46,10 @@
     depends_on:
       - mongo
     environment:
-      MONGO_USERNAME: user
-      MONGO_PASSWORD: password
-      MONGO_DATABASE: newsdb
-      MONGO_PORT: 27017
+      MONGO_USERNAME: ${MONGO_USERNAME}
+      MONGO_PASSWORD: ${MONGO_PASSWORD}
+      MONGO_DATABASE: ${MONGO_DATABASE}
+      MONGO_PORT: ${MONGO_PORT}
     networks:
       - internal_net
       - default

subscription-service/src/main/resources/application-docker.yml

@@ -20,9 +20,9 @@ spring:
     database-platform: org.hibernate.dialect.PostgreSQLDialect
 
 bot:
-  name: tnewsSubscriptionBot
-  token: 8128984956:AAHhuxvs5fGkLYnXT3dhbN7uHsiIF9LiHS0
+  name: ${BOT_NAME:-tnewsSubscriptionBot}
+  token: ${BOT_TOKEN}
 
 aggregator:
   service:
-    url: ${AGGREGATOR_SERVICE_URL}
+    url: ${AGGREGATOR_SERVICE_URL:-http://aggregation-service:8080/news}

subscription-service/src/main/resources/application.yml

@@ -1,10 +1,11 @@
 server:
   port: 8081
+
 spring:
   datasource:
-    url: jdbc:postgresql://localhost:5555/tnews_DB
-    username: tnews_DB
-    password: postgres_tnews_DB
+    url: ${SPRING_DATASOURCE_LOCAL_URL}
+    username: ${SPRING_DATASOURCE_USERNAME}
+    password: ${SPRING_DATASOURCE_PASSWORD}
     driver-class-name: org.postgresql.Driver
   feign:
     client:
@@ -13,19 +14,16 @@ spring:
           connectTimeout: 5000
           readTimeout: 5000
 
-
   jpa:
     show-sql: true
-
     hibernate:
       ddl-auto: update
-
     database-platform: org.hibernate.dialect.PostgreSQLDialect
 
 bot:
-  name: tnewsSubscriptionBot
-  token: 8128984956:AAHhuxvs5fGkLYnXT3dhbN7uHsiIF9LiHS0
+  name: ${BOT_NAME:-tnewsSubscriptionBot}
+  token: ${BOT_TOKEN}
 
 aggregator:
   service:
-    url: http://localhost:8080/news
+    url: ${AGGREGATOR_SERVICE_LOCAL_URL}