Update to 2022-01-28 00:00

This commit is contained in:
Daniel Berteaud
2022-01-28 00:00:19 +01:00
parent 6870f5b171
commit c614bcb149
7 changed files with 104 additions and 17 deletions

View File

@@ -9,9 +9,9 @@ from .common import *
DEBUG = False
#ADMINS = (
# ("Admin", "example@example.com"),
#)
ADMINS = (
("Admin", "{{ system_admin_email | default('admin@' ~ ansible_domain) }}"),
)
DATABASES = {
'default': {
@@ -128,7 +128,7 @@ ENABLE_TELEMETRY = False
## REGISTRATION
#########################################
PUBLIC_REGISTER_ENABLED = False
PUBLIC_REGISTER_ENABLED = {{ (taiga_user_registration or taiga_oidc_auth) | ternary('True', 'False') }}
#########################################
## THROTTLING
@@ -156,6 +156,15 @@ PUBLIC_REGISTER_ENABLED = False
# LIMIT ALLOWED DOMAINS FOR REGISTER AND INVITE
# None or [] values in USER_EMAIL_ALLOWED_DOMAINS means allow any domain
#USER_EMAIL_ALLOWED_DOMAINS = None
{% if taiga_user_registration_allowed_domains | length > 0 %}
USER_EMAIL_ALLOWED_DOMAINS=[
{% for domain in taiga_user_registration_allowed_domains %}
'{{ domain }}'
{% endfor %}
]
{% else %}
USER_EMAIL_ALLOWED_DOMAINS = None
{% endif %}
# PUCLIC OR PRIVATE NUMBER OF PROJECT PER USER
#MAX_PRIVATE_PROJECTS_PER_USER = None # None == no limit
@@ -218,3 +227,16 @@ FEEDBACK_ENABLED = False
# "cert": "XXXXXX_get_a_valid_cert_from_jira_XXXXXX",
# "pub_cert": "XXXXXX_get_a_valid_pub_cert_from_jira_XXXXXX"
#}
{% if taiga_oidc_auth %}
INSTALLED_APPS += ["taiga_contrib_openid_auth"]
OPENID_USER_URL = "{{ taiga_oidc_user_url }}"
OPENID_TOKEN_URL = "{{ taiga_oidc_token_url }}"
OPENID_CLIENT_ID = "{{ taiga_oidc_client_id }}"
OPENID_CLIENT_SECRET = "{{ taiga_oidc_client_secret }}"
OPENID_SCOPE = "{{ taiga_oidc_scope }}"
OPENID_ID_FIELD = "{{ taiga_oidc_id_field }}"
OPENID_USERNAME_FIELD = "{{ taiga_oidc_user_field }}"
OPENID_FULLNAME_FIELD = "{{ taiga_oidc_fullname_field }}"
OPENID_EMAIL_FIELD = "{{ taiga_oidc_email_field }}"
{% endif %}

View File

@@ -16,7 +16,7 @@
"supportUrl": "https://resources.taiga.io",
"privacyPolicyUrl": null,
"termsOfServiceUrl": null,
"maxUploadFileSize": {{ taiga_max_upload_file_size }},
"maxUploadFileSize": {{ taiga_max_upload_file_size * 1024 * 1024 }},
"contribPlugins": [],
"tagManager": { "accountId": null },
"tribeHost": null,
@@ -25,5 +25,14 @@
"enableJiraImporter": false,
"enableTrelloImporter": false,
"gravatar": false,
{% if taiga_oidc_auth %}
"openidAuth" : "{{ taiga_oidc_auth_url }}",
"openidScope": "{{ taiga_oidc_scope }}",
"openidName" : "{{ taiga_oidc_name }}",
"openidClientId": "{{ taiga_oidc_client_id }}",
"contribPlugins": [
"/plugins/openid-auth/openid-auth.json"
],
{% endif %}
"rtlLanguages": ["ar", "fa", "he"]
}