Skip to content

Commit

Permalink
Fix quoting inconsistencies in env vars
Browse files Browse the repository at this point in the history
Greenlight treats all environment variables as case-sensitive strings. In
particular, boolean values "true" and "false" need to be lower-case, whereas
the string representation of YAML booleans uses "True" and "False". In order
to avoid harmful capitalization of boolean values, we need to quote them as
YAML strings.
  • Loading branch information
dkobras committed May 28, 2020
1 parent 39dd70f commit 4f1272d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ bbb_greenlight_db_name: greenlight_production
bbb_greenlight_db_port: 5432
bbb_greenlight_environment: {}
bbb_greenlight_environment_defaults:
HELP_URL: https://docs.bigbluebutton.org/greenlight/gl-overview.html
ALLOW_GREENLIGHT_ACCOUNTS: true
DEFAULT_REGISTRATION: open
RELATIVE_URL_ROOT: /b
ROOM_FEATURES: mute-on-join,require-moderator-approval,anyone-can-start,all-join-moderator
PAGINATION_NUMBER: 25
NUMBER_OF_ROWS: 25
MAINTENANCE_MODE: false
HELP_URL: "https://docs.bigbluebutton.org/greenlight/gl-overview.html"
ALLOW_GREENLIGHT_ACCOUNTS: "true"
DEFAULT_REGISTRATION: "open"
RELATIVE_URL_ROOT: "/b"
ROOM_FEATURES: "mute-on-join,require-moderator-approval,anyone-can-start,all-join-moderator"
PAGINATION_NUMBER: "25"
NUMBER_OF_ROWS: "25"
MAINTENANCE_MODE: "false"
DB_ADAPTER: "{{ bbb_greenlight_db_adapter }}"
DB_HOST: "{{ bbb_greenlight_db_host }}"
DB_PORT: "{{ bbb_greenlight_db_port }}"
Expand Down
8 changes: 4 additions & 4 deletions templates/greenlight-docker-compose.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
environment:
{% set bbb_greenlight_environment_combined = bbb_greenlight_environment_defaults | combine(bbb_greenlight_environment) -%}
{% for envvar in bbb_greenlight_environment_combined %}
- {{ envvar }}={{ bbb_greenlight_environment_combined[envvar] }}
{{ envvar }}: "{{ bbb_greenlight_environment_combined[envvar] }}"
{% endfor %}
volumes:
- {{ bbb_greenlight_logdir }}:/usr/src/app/log
Expand All @@ -29,7 +29,7 @@ services:
volumes:
- {{ bbb_greenlight_dbdir }}:/var/lib/postgresql/data
environment:
- POSTGRES_DB={{ bbb_greenlight_db_name }}
- POSTGRES_USER="{{ bbb_greenlight_db_username }}"
- POSTGRES_PASSWORD="{{ bbb_greenlight_db_password }}"
POSTGRES_DB: "{{ bbb_greenlight_db_name }}"
POSTGRES_USER: "{{ bbb_greenlight_db_username }}"
POSTGRES_PASSWORD: "{{ bbb_greenlight_db_password }}"
{% endif %}

0 comments on commit 4f1272d

Please sign in to comment.