Skip to content

Commit

Permalink
Merge pull request #2 from zakkg3/master
Browse files Browse the repository at this point in the history
Add LDAP variables to the configmap
  • Loading branch information
mvitale1989 authored Mar 7, 2020
2 parents a270b4c + b4c65e4 commit c48250b
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: helm-taiga
version: 0.2.0
version: 0.2.1
appVersion: "3.3.0-3-gd0ec0f9"
description: Helm chart for the taiga project management platform
keywords:
Expand Down
16 changes: 16 additions & 0 deletions templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
labels:
{{ include "taiga.labels" . | indent 4 }}
data:
DEBUG: {{ .Values.taiga.debug | default "False" | quote }}
TAIGA_HOSTNAME: {{ required "taiga.apiserver must be set" .Values.taiga.apiserver }}
TAIGA_SSL: "false"
TAIGA_SSL_BY_REVERSE_PROXY: {{ .Values.taiga.behindTlsProxy | ternary "True" "False" | quote }}
Expand All @@ -19,3 +20,18 @@ data:
TAIGA_EMAIL_PORT: {{ default 587 .Values.taiga.emailSmtpPort | quote }}
TAIGA_EMAIL_USER: {{ required "taiga.emailSmtpUser must be set" .Values.taiga.emailSmtpUser | quote }}
{{- end }}
{{- if .Values.taiga.ldap.enabled }}
LDAP_AUTH_ENABLE: "True"
LDAP_START_TLS: {{ .Values.taiga.ldap.use_tls | default "False" | quote }}
LDAP_SERVER: {{ .Values.taiga.ldap.ldap_server | quote }}
LDAP_PORT: {{ .Values.taiga.ldap.port | default 389 | quote }}
LDAP_BIND_DN: {{ .Values.taiga.ldap.bind_dn | default "" | quote }}
LDAP_SEARCH_BASE: {{ .Values.taiga.ldap.base_dn | quote }}
LDAP_BIND_PASSWORD: {{ .Values.taiga.ldap.password | quote }}
LDAP_USERNAME_ATTRIBUTE: {{ .Values.taiga.ldap.username_attribute | default "uid" | quote }}
LDAP_EMAIL_ATTRIBUTE: {{ .Values.taiga.ldap.email_attribute | default "mail" | quote }}
LDAP_FULL_NAME_ATTRIBUTE: {{ .Values.taiga.ldap.full_name_attribute | default "displayName" | quote }}
LDAP_FALLBACK: {{ .Values.taiga.ldap.fallback | default "normal" | quote }}
LDAP_SAVE_LOGIN_PASSWORD: {{ .Values.taiga.ldap.save_password | default "False" | quote }}
LDAP_SEARCH_FILTER_ADDITIONAL: {{ .Values.taiga.ldap.filter | default "" | quote }}
{{- end }}
15 changes: 14 additions & 1 deletion values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,20 @@ taiga:
# emailSmtpPort: 587
# emailSmtpUser: "[email protected]"
# emailSmtpPassword: ""

ldap:
enabled: False
use_tls: False
ldap_server: ldap://<ldap_server_host_name>
port: 389
bind_dn: "cn=something,ou=admins,ou=theouhere,ou=auth,o=ethz,c=ch"
base_dn: "basednhere"
password: "changeme"
username_attribute: "uid"
email_attribute: "mail"
full_name_attribute: "displayName"
fallback: "normal"
save_password: False
filter: "(mail=*)"
### Configure taiga-back's secret key
### If omitted, a random alphanumeric string of 10 characters will be generated
###
Expand Down

0 comments on commit c48250b

Please sign in to comment.