Skip to content
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
6 changes: 4 additions & 2 deletions apis/installer/v1alpha1/ace_ace_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,10 @@ type PlatformSettings struct {
ServiceEnableCaptcha bool `json:"serviceEnableCaptcha"`
ServiceRegisterEmailConfirm bool `json:"serviceRegisterEmailConfirm"`
ServiceDisableRegistration bool `json:"serviceDisableRegistration"`
ServiceRequireSignInView bool `json:"serviceRequireSignInView"`
ServiceEnableNotifyMail bool `json:"serviceEnableNotifyMail"`
// +optional
DisableRegularOrgCreation *bool `json:"disableRegularOrgCreation"`
ServiceRequireSignInView bool `json:"serviceRequireSignInView"`
ServiceEnableNotifyMail bool `json:"serviceEnableNotifyMail"`
// +optional
ServiceDomainWhiteList []string `json:"serviceDomainWhiteList"`
CookieName string `json:"cookieName"`
Expand Down
5 changes: 5 additions & 0 deletions apis/installer/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions charts/ace/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ The following table lists the configurable parameters of the `ace` chart and the
| settings.platform.serviceEnableCaptcha | # Enable this to use captcha validation for registration. # | <code>true</code> |
| settings.platform.serviceRegisterEmailConfirm | # Users need to confirm e-mail for registration # | <code>true</code> |
| settings.platform.serviceDisableRegistration | # Weather or not to allow users to register. # | <code>false</code> |
| settings.platform.disableRegularOrgCreation | # Bar regular users from creating organizations. Only seeds the ace-user-config secret; # site admins toggle it at runtime. Null lets the platform decide (on for selfhosted). # | <code>null</code> |
| settings.platform.serviceRequireSignInView | # Weather or not sign in is required to view anything. # | <code>false</code> |
| settings.platform.serviceEnableNotifyMail | # Mail notification # | <code>true</code> |
| settings.platform.serviceDomainWhiteList | # To create an account, email should belong to this domain list # | <code>[]</code> |
Expand Down
5 changes: 5 additions & 0 deletions charts/ace/templates/platform/user-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ stringData:
user.ini: |-
[service]
EMAIL_DOMAIN_WHITELIST = {{ join "," .Values.settings.platform.serviceDomainWhiteList }}
{{- if kindIs "bool" .Values.settings.platform.disableRegularOrgCreation }}

[admin]
DISABLE_REGULAR_ORG_CREATION = {{ .Values.settings.platform.disableRegularOrgCreation }}
{{- end }}

[branding]
APP_NAME = {{ .Values.settings.platform.appName }}
Expand Down
2 changes: 2 additions & 0 deletions charts/ace/values.openapiv3_schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24750,6 +24750,8 @@ properties:
type: string
disableHttpGit:
type: boolean
disableRegularOrgCreation:
type: boolean
enableCSRFCookieHttpOnly:
type: boolean
forcePrivate:
Expand Down
5 changes: 5 additions & 0 deletions charts/ace/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,11 @@ settings:
##
serviceDisableRegistration: false

## Bar regular users from creating organizations. Only seeds the ace-user-config secret;
## site admins toggle it at runtime. Null lets the platform decide (on for selfhosted).
##
disableRegularOrgCreation: null

## Weather or not sign in is required to view anything.
##
serviceRequireSignInView: false
Expand Down
Loading