Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix environment variable for postgres database #141

Merged
merged 1 commit into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ BH_NEO4J_WEB_PORT=7575
# BloodHound Postgres
BH_POSTGRES_USER=bloodhound
BH_POSTGRES_PASSWORD=bloodhoundcommunityedition
BH_POSTGRES_DATABASE=bloodhound
BH_POSTGRES_DB=bloodhound
BH_POSTGRES_VOLUME=bh-postgres-data
BH_POSTGRES_PORT=6543

# Integration Postgres
INTEGRATION_POSTGRES_USER=bloodhound
INTEGRATION_POSTGRES_PASSWORD=bloodhoundcommunityedition
INTEGRATION_POSTGRES_DATABASE=bloodhound
INTEGRATION_POSTGRES_DB=bloodhound
INTEGRATION_POSTGRES_PORT=65432

# Integration Neo4j
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ services:
environment:
- POSTGRES_USER=${BH_POSTGRES_USER:-bloodhound}
- POSTGRES_PASSWORD=${BH_POSTGRES_PASSWORD:-bloodhoundcommunityedition}
- POSTGRES_DATABASE=${BH_POSTGRES_DATABASE:-bloodhound}
- POSTGRES_DB=${BH_POSTGRES_DB:-bloodhound}
ports:
- ${BH_POSTGRES_PORT:-5432}:5432
volumes:
Expand All @@ -45,7 +45,7 @@ services:
test:
[
"CMD-SHELL",
"pg_isready -U ${BH_POSTGRES_USER:-bloodhound} -d 'dbname=${BH_POSTGRES_DATABASE:-bloodhound}' -h 127.0.0.1 -p 5432"
"pg_isready -U ${BH_POSTGRES_USER:-bloodhound} -d 'dbname=${BH_POSTGRES_DB:-bloodhound}' -h 127.0.0.1 -p 5432"
]
interval: 10s
timeout: 5s
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
environment:
- POSTGRES_USER=bloodhound
- POSTGRES_PASSWORD=bloodhoundcommunityedition
- POSTGRES_DATABASE=bloodhound
- POSTGRES_DB=bloodhound
ports:
- 65432:5432
volumes:
Expand Down
2 changes: 1 addition & 1 deletion examples/docker-compose/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ BLOODHOUND_TAG=latest
# Postgres auth configuration
POSTGRES_USER=bloodhound
POSTGRES_PASSWORD=bloodhoundcommunityedition
POSTGRES_DATABASE=bloodhound
POSTGRES_DB=bloodhound

# Auth string for NEO4J credentials
NEO4J_AUTH=neo4j/bloodhoundcommunityedition
Expand Down
4 changes: 2 additions & 2 deletions examples/docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
environment:
- POSTGRES_USER=${POSTGRES_USER:-bloodhound}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-bloodhoundcommunityedition}
- POSTGRES_DATABASE=${POSTGRES_DATABASE:-bloodhound}
- POSTGRES_DB=${POSTGRES_DB:-bloodhound}
# Database ports are disabled by default. Please change your database password to something secure before uncommenting
# ports:
# - ${POSTGRES_PORT:-5432}:5432
Expand All @@ -31,7 +31,7 @@ services:
test:
[
"CMD-SHELL",
"pg_isready -U ${POSTGRES_USER:-bloodhound} -d ${POSTGRES_DATABASE:-bloodhound} -h 127.0.0.1 -p 5432"
"pg_isready -U ${POSTGRES_USER:-bloodhound} -d ${POSTGRES_DB:-bloodhound} -h 127.0.0.1 -p 5432"
]
interval: 10s
timeout: 5s
Expand Down