From 6030bcde2afbc718a3f5dcc1a7452c127f638af0 Mon Sep 17 00:00:00 2001 From: Keny Villela Date: Mon, 12 Sep 2022 14:10:20 -0300 Subject: [PATCH] testing corretion --- charts/sigi/v0/questions.yaml | 2 +- charts/sigi/v0/templates/deployment.yaml | 60 ++++++++++++------------ charts/sigi/v0/values.yaml | 8 ++-- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/charts/sigi/v0/questions.yaml b/charts/sigi/v0/questions.yaml index b91cf29..5c604dc 100644 --- a/charts/sigi/v0/questions.yaml +++ b/charts/sigi/v0/questions.yaml @@ -5,7 +5,7 @@ categories: questions: # Informações Básicas - variable: sigi.hostname - default: {{ include "sigi.fullname" . }}.interlegis.leg.br + default: {{ include "sigi.fullname" . }} .interlegis.leg.br description: "Endereço para acesso ao SIGI" label: "URL do SIGI" type: string diff --git a/charts/sigi/v0/templates/deployment.yaml b/charts/sigi/v0/templates/deployment.yaml index b4e0f1b..043e31f 100644 --- a/charts/sigi/v0/templates/deployment.yaml +++ b/charts/sigi/v0/templates/deployment.yaml @@ -51,36 +51,36 @@ spec: value: "{{ .Values.sigi.emailHost }}" - name: DEFAULT_FROM_EMAIL value: "{{ .Values.sigi.defaultFromEmail }}" - - name: AUTH_LDAP_SERVER_URI - value: "{{ .Values.sigi.auth.ldap.serverURI }}" - - name: AUTH_LDAP_BIND_DN - value: "{{ .Values.sigi.auth.ldap.bindDN }}" - - name: AUTH_LDAP_BIND_PASSWORD - value: "{{ .Values.sigi.auth.ldap.bindPwd }}" - - name: AUTH_LDAP_USER - value: "{{ .Values.sigi.auth.ldap.user }}" - - name: AUTH_LDAP_USER_SEARCH_STRING - value: "{{ .Values.sigi.auth.ldap.userSearchString }}" - - name: AUTH_LDAP_GROUP - value: "{{ .Values.sigi.auth.ldap.group }}" - - name: AUTH_LDAP_GROUP_SEARCH_STRING - value: "{{ .Values.sigi.auth.ldap.groupSearchString }}" - - name: AUTH_LDAP_GROUP_TYPE_STRING - value: "{{ .Values.sigi.auth.ldap.groupTypeString }}" - - name: AUTH_LDAP_USER_ATTR_MAP - value: "{{ .Values.sigi.auth.ldap.userAttrMap }}" - - name: AUTH_LDAP_PROFILE_ATTR_MAP - value: "{{ .Values.sigi.auth.ldap.profileAttrMap }}" - - name: AUTH_LDAP_FIND_GROUP_PERMS - value: "{{ .Values.sigi.auth.ldap.findGroupPerms }}" - - name: AUTH_LDAP_MIRROR_GROUPS - value: "{{ .Values.sigi.auth.ldap.mirrorGroups }}" - - name: AUTH_LDAP_CACHE_GROUPS - value: "{{ .Values.sigi.auth.ldap.cacheGroups }}" - - name: AUTH_LDAP_GROUP_CACHE_TIMEOUT - value: "{{ .Values.sigi.auth.ldap.groupCacheTimeout }}" - - name: AUTH_PROFILE_MODULE - value: "{{ .Values.sigi.auth.profileModule }}" +# - name: AUTH_LDAP_SERVER_URI +# value: "{{ .Values.sigi.auth.ldap.serverURI }}" +# - name: AUTH_LDAP_BIND_DN +# value: "{{ .Values.sigi.auth.ldap.bindDN }}" +# - name: AUTH_LDAP_BIND_PASSWORD +# value: "{{ .Values.sigi.auth.ldap.bindPwd }}" +# - name: AUTH_LDAP_USER +# value: "{{ .Values.sigi.auth.ldap.user }}" +# - name: AUTH_LDAP_USER_SEARCH_STRING +# value: "{{ .Values.sigi.auth.ldap.userSearchString }}" +# - name: AUTH_LDAP_GROUP +# value: "{{ .Values.sigi.auth.ldap.group }}" +# - name: AUTH_LDAP_GROUP_SEARCH_STRING +# value: "{{ .Values.sigi.auth.ldap.groupSearchString }}" +# - name: AUTH_LDAP_GROUP_TYPE_STRING +# value: "{{ .Values.sigi.auth.ldap.groupTypeString }}" +# - name: AUTH_LDAP_USER_ATTR_MAP +# value: "{{ .Values.sigi.auth.ldap.userAttrMap }}" +# - name: AUTH_LDAP_PROFILE_ATTR_MAP +# value: "{{ .Values.sigi.auth.ldap.profileAttrMap }}" +# - name: AUTH_LDAP_FIND_GROUP_PERMS +# value: "{{ .Values.sigi.auth.ldap.findGroupPerms }}" +# - name: AUTH_LDAP_MIRROR_GROUPS +# value: "{{ .Values.sigi.auth.ldap.mirrorGroups }}" +# - name: AUTH_LDAP_CACHE_GROUPS +# value: "{{ .Values.sigi.auth.ldap.cacheGroups }}" +# - name: AUTH_LDAP_GROUP_CACHE_TIMEOUT +# value: "{{ .Values.sigi.auth.ldap.groupCacheTimeout }}" +# - name: AUTH_PROFILE_MODULE +# value: "{{ .Values.sigi.auth.profileModule }}" volumeMounts: # - mountPath: /var/interlegis/sigi/data # name: data diff --git a/charts/sigi/v0/values.yaml b/charts/sigi/v0/values.yaml index 2b2541c..854085c 100644 --- a/charts/sigi/v0/values.yaml +++ b/charts/sigi/v0/values.yaml @@ -53,8 +53,8 @@ sigi: timeZone: 'America/Sao_Paulo' language: 'pt_BR.UTF-8' emailPort: 25 - emailHost: smtp.interlegis.leg.br - defaultFromEmail: sigi@interlegis.leg.br + emailHost: 'smtp.interlegis.leg.br' + defaultFromEmail: 'sigi@interlegis.leg.br' auth: ldap: serverURI: 'ldap://ad.senado.gov.br' @@ -65,8 +65,8 @@ sigi: group: 'OU=GruposAutomaticosOU,DC=senado,DC=gov,DC=br' groupSearchString: '(objectClass=Group)' groupTypeString: 'cn' - userAttrMap: {"first_name": "givenName", "last_name": "sn", "email": "userPrincipalName", 'is_staff': "cn",} - profileAttrMap: {"nome_completo": "cn"} + userAttrMap: '{"first_name": "givenName", "last_name": "sn", "email": "userPrincipalName", "is_staff": "cn",}' + profileAttrMap: '{"nome_completo": "cn"}' findGroupPerms: True mirrorGroups: True cacheGroups: True