Skip to content

Commit

Permalink
Clean up bool configs
Browse files Browse the repository at this point in the history
  • Loading branch information
imnasnainaec committed Jul 23, 2024
1 parent 1677530 commit 303c745
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ A rapid word collection tool. See the [User Guide](https://sillsdev.github.io/Th
### Prepare the Environment

1. _(Optional)_ If you want the email services to work you will need to set the following environment variables. These
SMTP values must be kept secret, so ask your email administrator to supply them. Set them in your `.profile` (Linux
or Mac 10.14-), your `.zprofile` (Mac 10.15+), or the _System_ app (Windows).
`COMBINE_SMTP_` values must be kept secret, so ask your email administrator to supply them. Set them in your
`.profile` (Linux or Mac 10.14-), your `.zprofile` (Mac 10.15+), or the _System_ app (Windows).

- `COMBINE_EMAIL_ENABLED=true`
- `COMBINE_SMTP_SERVER`
Expand Down Expand Up @@ -687,9 +687,9 @@ Notes:
### Setup Environment Variables

Before installing _The Combine_ in Kubernetes, you need to set the following environment variables:
`COMBINE_CAPTCHA_REQUIRED`, `COMBINE_CAPTCHA_SECRET_KEY`, `COMBINE_JWT_SECRET_KEY`. For development environments, you
can use the values defined in `Backend/Properties/launchSettings.json`. Set them in your `.profile` (Linux or Mac
10.14-), your `.zprofile` (Mac 10.15+), or the _System_ app (Windows).
`COMBINE_CAPTCHA_SECRET_KEY`, `COMBINE_JWT_SECRET_KEY`. For development environments, you can use the values defined in
`Backend/Properties/launchSettings.json`. Set them in your `.profile` (Linux or Mac 10.14-), your `.zprofile` (Mac
10.15+), or the _System_ app (Windows).

_Note: The following is optional for Development Environments._

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ metadata:
name: env-backend
namespace: {{ .Release.Namespace }}
data:
COMBINE_CAPTCHA_REQUIRED: {{ .Values.global.captchaRequired | quote | toLower }}
COMBINE_CAPTCHA_REQUIRED: {{ .Values.global.captchaRequired | quote | lower }}
COMBINE_CAPTCHA_VERIFY_URL: {{ .Values.captchaVerifyUrl | quote }}
COMBINE_EMAIL_ENABLED: {{ .Values.global.emailEnabled | quote | toLower }}
COMBINE_EMAIL_ENABLED: {{ .Values.global.emailEnabled | quote | lower }}
COMBINE_PASSWORD_RESET_EXPIRE_TIME:
{{ .Values.combinePasswordResetTime | quote }}
COMBINE_SMTP_ADDRESS: {{ .Values.combineSmtpAddress | quote }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ data:
SERVER_NAME: {{ .Values.global.serverName }}
CERT_ADDL_DOMAINS: {{ .Values.combineAddlDomainList | quote }}
CONFIG_USE_CONNECTION_URL: "true"
CONFIG_CAPTCHA_REQUIRED: {{ .Values.global.captchaRequired | quote | toLower }}
CONFIG_CAPTCHA_REQUIRED: {{ .Values.global.captchaRequired | quote | lower }}
CONFIG_CAPTCHA_SITE_KEY: {{ .Values.configCaptchaSiteKey | quote }}
CONFIG_OFFLINE: {{ .Values.configOffline | quote | toLower }}
CONFIG_EMAIL_ENABLED: {{ .Values.global.emailEnabled | quote | toLower }}
CONFIG_SHOW_CERT_EXPIRATION: {{ .Values.configShowCertExpiration | quote | toLower }}
CONFIG_OFFLINE: {{ .Values.configOffline | quote | lower }}
CONFIG_EMAIL_ENABLED: {{ .Values.global.emailEnabled | quote | lower }}
CONFIG_SHOW_CERT_EXPIRATION: {{ .Values.configShowCertExpiration | quote | lower }}
{{- if .Values.configAnalyticsWriteKey }}
CONFIG_ANALYTICS_WRITE_KEY: {{ .Values.configAnalyticsWriteKey | quote }}
{{- end }}
4 changes: 2 additions & 2 deletions deploy/helm/thecombine/charts/frontend/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ imageName: combine_frontend
# The additional domain list is a space-separated string list of domains
combineAddlDomainList: ""
configCaptchaSiteKey: "None - defined in profiles"
configOffline: "false"
configShowCertExpiration: "false"
configOffline: false
configShowCertExpiration: false
configAnalyticsWriteKey: ""

0 comments on commit 303c745

Please sign in to comment.