Skip to content
This repository has been archived by the owner on Dec 14, 2021. It is now read-only.

Commit

Permalink
Revert "use env file in greenlight database"
Browse files Browse the repository at this point in the history
This reverts commit e056e52.
  • Loading branch information
alangecker committed Sep 6, 2020
1 parent 5fbefe5 commit 27dde44
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 28 deletions.
14 changes: 6 additions & 8 deletions docker-compose.greenlight.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,20 @@ services:
environment:
DB_ADAPTER: postgresql
DB_HOST: postgres
DB_NAME: ${POSTGRES_DB}
DB_USERNAME: ${POSTGRES_USER}
DB_PASSWORD: ${POSTGRES_PASSWORD}
DB_NAME: greenlight
DB_USERNAME: postgres
DB_PASSWORD: password
BIGBLUEBUTTON_ENDPOINT: ${GREENLIGHT_ENDPOINT}
BIGBLUEBUTTON_SECRET: ${SHARED_SECRET}
SECRET_KEY_BASE: ${RAILS_SECRET}
depends_on:
- redis
ports:
- 10.7.7.1:5000:80
postgres:
image: postgres:12
restart: unless-stopped
environment:
POSTGRES_DB: ${POSTGRES_DB}
POSTGRES_USER: ${POSTGRES_USER}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
POSTGRES_DB: greenlight
POSTGRES_USER: postgres
POSTGRES_PASSWORD: password
volumes:
- ./postgres-data:/var/lib/postgresql/data
20 changes: 0 additions & 20 deletions sample.env
Original file line number Diff line number Diff line change
Expand Up @@ -168,21 +168,6 @@ LDAP_FILTER=
#
ALLOW_GREENLIGHT_ACCOUNTS=true

# To enable reCaptcha on the user sign up, define these 2 keys
# You can obtain these keys by registering your domain using the following url:
#
# https://www.google.com/recaptcha/admin
#
# RECAPTCHA_SITE_KEY=
# RECAPTCHA_SECRET_KEY=

# To enable Google Analytics on your site, set this key to the Google Analytics Property Tracking ID
#
# https://analytics.google.com/analytics/web/
#
# GOOGLE_ANALYTICS_TRACKING_ID=


# Set this to true if you want GreenLight to send verification emails upon
# the creation of a new account
#
Expand Down Expand Up @@ -310,8 +295,3 @@ HELP_URL=https://docs.bigbluebutton.org/greenlight/gl-overview.html
# invite - For invite only registration
# approval - For approve/decline registration
DEFAULT_REGISTRATION=open

# Specify postgresql database credentials to be used by Greenlight.
POSTGRES_DB=greenlight
POSTGRES_USER=postgres
POSTGRES_PASSWORD=verysecurepassword

2 comments on commit 27dde44

@yksflip
Copy link

@yksflip yksflip commented on 27dde44 Nov 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a particular reason why you reverted the use of .env for the postgres credentials?
Outside connections to the db should not be possible, thats why its probably ok to use a weak password, but it also wouldn't hurt to have a secure password?

@alangecker
Copy link
Owner Author

@alangecker alangecker commented on 27dde44 Nov 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yksflip
this was reverted, because it was a change not related to the merge request: #16 (comment)

generally I also think, that additional security is always good and in this case, it doesn't really hurt :)

Please sign in to comment.