Remove default password from application.yml
Issue-ID: CPS-319
Signed-off-by: Renu Kumari <renu.kumari@bell.ca>
Change-Id: I61a5e098ffa173721cfa48aa0b992610f6a6e1a0
diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 1bcb496..3edb20c 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -61,8 +61,8 @@
# comma-separated uri patterns which do not require authorization
permit-uri: /manage/health/**,/manage/info,/swagger-ui/**,/swagger-resources/**,/v3/api-docs
auth:
- username: ${CPS_USERNAME:cpsuser}
- password: ${CPS_PASSWORD:cpsr0cks!}
+ username: ${CPS_USERNAME}
+ password: ${CPS_PASSWORD}
# Actuator
management:
diff --git a/docker-compose/README.md b/docker-compose/README.md
index 3e9cd63..4d20ece 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -55,7 +55,7 @@
Following command starts the application using JAR file:
```bash
-DB_HOST=localhost DB_USERNAME=cps DB_PASSWORD=cps \
+DB_HOST=localhost DB_USERNAME=cps DB_PASSWORD=cps CPS_USERNAME=cpsuser CPS_PASSWORD=cpsr0cks! \
java -jar cps-application/target/cps-application-x.y.z-SNAPSHOT.jar
```
@@ -65,7 +65,8 @@
1. Enable the desired maven profile form Maven Tool Window
2. Run a configuration from `Run -> Edit configurations` with following settings:
- * `Environment variables`: `DB_HOST=localhost;DB_USERNAME=cps;DB_PASSWORD=cps`
+ * `Environment variables`: `DB_HOST=localhost;DB_USERNAME=cps;DB_PASSWORD=cps
+ CPS_USERNAME=cpsuser CPS_PASSWORD=cpsr0cks!`
## Accessing services
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 0cd4951..2251304 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -55,6 +55,8 @@
ports:
- "8883:8080"
environment:
+ CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
+ CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
DB_HOST: dbpostgresql
DB_USERNAME: ${DB_USERNAME}
DB_PASSWORD: ${DB_PASSWORD}