From 55627e6b9223d3abcc8e402398bcabdd74748161 Mon Sep 17 00:00:00 2001
From: Keny Villela <keny@interlegis.leg.br>
Date: Wed, 3 May 2023 14:37:47 -0300
Subject: [PATCH] return v0.2.3

---
 charts/sigi/v0.2.3/questions.yaml | 147 +++++++-----------------------
 charts/sigi/v0.2.3/values.yaml    |  20 ++--
 2 files changed, 44 insertions(+), 123 deletions(-)

diff --git a/charts/sigi/v0.2.3/questions.yaml b/charts/sigi/v0.2.3/questions.yaml
index 70aa25a..ae15bd9 100644
--- a/charts/sigi/v0.2.3/questions.yaml
+++ b/charts/sigi/v0.2.3/questions.yaml
@@ -14,119 +14,6 @@ questions:
   group: Básico
   required: true
 
-# Correio
-- variable: sigi.emailAdmins
-  default: "(('SIGI Administrator', 'sigi@interlegis.leg.br'),)"
-  description: "Administrador do e-mail do SIGI"
-  label: "Administrador"
-  type: string
-  group: Correio
-  required: false
-- variable: sigi.defaultFromEmail
-  default: "sigi@interlegis.leg.br"
-  description: "Remetente dos e-mails enviados pelo SIGI"
-  label: "Remetente"
-  type: string
-  group: Correio
-  required: false
-# - variable: sigi.useTls
-#  default: "False"
-#  description: "Usar TLS ao conectar no servidor SMTP?"
-#  label: "Usar TLS"
-#  type: enum
-#  group: Correio
-#  options: 
-#    - "True"
-#    - "False"
-#  required: false
-- variable: sigi.emailPort
-  default: 25
-  description: "Porta de envio de E-mail (SMTP)"
-  type: int
-  label: "Porta SMTP"
-  required: false
-  group: Correio
-- variable: sigi.emailHost
-  default: "smtp.interlegis.leg.br"
-  description: "Servidor de envio de e-mail (SMTP)"
-  label: "Servidor SMTP"
-  type: string
-  group: Correio
-  required: false
-
-# ldap auth
-- variable: sigi.auth.ldap.serverURI
-  default: ''
-  description: "Servidor autenticação ldap"
-  label: "Servidor ldap"
-  type: string
-  group: LDAP
-  required: false
-- variable: sigi.auth.ldap.bindDN
-  default: ''
-  description: "Bind de autenticação ldap"
-  label: "Bind de autenticação ldap"
-  type: string
-  group: LDAP
-  required: false
-# - variable: sigi.auth.ldap.bindPwd
-#   default: 'altereme'
-#   description: "Autenticação do Bind no ldap"
-#   label: "Senha Bind"
-#   type: string
-#   group: LDAP
-#   required: false
-- variable: sigi.auth.ldap.user
-  default: ''
-  description: "OU de Usuário no ldap"
-  label: "OU a ser utilizada na autenticação de Usuário no ldap"
-  type: string
-  group: LDAP
-  required: false
-- variable: sigi.auth.ldap.userSearchString
-  default: ''
-  description: "Query de pesquisa de Usuários no ldap"
-  label: "Pesquisa no ldap"
-  type: string
-  group: LDAP
-  required: false
-- variable: sigi.auth.ldap.userAttrMap
-  default: ''
-  description: "Atributos do Usuário buscados no ldap"
-  label: "Atributos do usuário no ldap"
-  type: string
-  group: LDAP
-  required: false
-- variable: sigi.auth.ldap.profileAttrMap
-  default: ''
-  description: "Atributos do perfil do Usuário no ldap"
-  label: "Atributos do perfil do usuário"
-  type: string
-  group: LDAP
-  required: false
-- variable: sigi.auth.profileModule
-  default: ''
-  description: "Módulo do perfil do Usuário no ldap"
-  label: "Módulo do perfil do usuário"
-  type: string
-  group: LDAP
-  required: false
-
-# Saberes
-- variable: sigi.saberes.moodleUrl
-  default: ''
-  description: "Servidor moodle saberes"
-  label: "Servidor Saberes"
-  type: string
-  group: Saberes
-  required: false
-- variable: sigi.saberes.moodleToken
-  default: 'altereme'
-  description: "Token conexão Saberes"
-  label: "Token Saberes"
-  type: string
-  group: Saberes
-  required: false
 
 # Ingress
 - variable: ingress.tls.enabled
@@ -149,6 +36,7 @@ questions:
         - letsencrypt
         - letsencrypt-hml
         - aws
+
 - variable: ingress.class
   default: nginx
   type: enum
@@ -160,6 +48,39 @@ questions:
     - nginx
     - alb
 
+## Correio
+#- variable: sigi.emailSendUser
+#  default: "sigi@interlegis.leg.br"
+#  description: "Remetente dos e-mails enviados pelo SIGI"
+#  label: "Remetente"
+#  type: string
+#  group: Correio
+#  required: false
+#- variable: sigi.useTls
+#  default: "False"
+#  description: "Usar TLS ao conectar no servidor SMTP?"
+#  label: "Usar TLS"
+#  type: enum
+#  group: Correio
+#  options: 
+#    - "True"
+#    - "False"
+#  required: false
+#- variable: sigi.emailPort
+#  default: 25
+#  description: "Porta de envio de E-mail (SMTP)"
+#  type: int
+#  label: "Porta SMTP"
+#  required: false
+#  group: Correio
+#- variable: sigi.emailHost
+#  default: "smtp.interlegis.leg.br"
+#  description: "Servidor de envio de e-mail (SMTP)"
+#  label: "Servidor SMTP"
+#  type: string
+#  group: Correio
+#  required: false
+
 ## PostgreSQL
 #- variable: postgresql.internal
 #  default: true
diff --git a/charts/sigi/v0.2.3/values.yaml b/charts/sigi/v0.2.3/values.yaml
index 28438b3..7096fa9 100644
--- a/charts/sigi/v0.2.3/values.yaml
+++ b/charts/sigi/v0.2.3/values.yaml
@@ -58,12 +58,12 @@ sigi:
   defaultFromEmail: 'sigi@interlegis.leg.br'
   auth:
     ldap:
-      serverURI: ''
-      bindDN: ''
-      bindPwd: ''
-      user: ''
-      userSearchString: ''
-      userAttrMap: ''
+      serverURI: 'ldap://ad.senado.gov.br'
+      bindDN: 'CN=Sistema de Informações Gerenciais do Interlegis Service Account,OU=_UsuariosServicos,OU=2-AdministracaoSistemas,DC=senado,DC=gov,DC=br'
+      bindPwd: 'RgtJdtvas7s4BSpjnVnR'
+      user: 'OU=UsuariosPessoas,DC=senado,DC=gov,DC=br'
+      userSearchString: '(&(sAMAccountName=%(user)s)(department=*ILB*)(!(title=*Desligad*))(!(title=*inativ*)))'
+      userAttrMap: '{"first_name": "givenName", "last_name": "sn", "email": "userPrincipalName", }'
       group: ''
       groupSearchString: ''
       groupTypeString: ''
@@ -71,11 +71,11 @@ sigi:
       mirrorGroups: False
       cacheGroups: False
       groupCacheTimeout: 0
-      profileAttrMap: ''
-    profileModule: ''
+      profileAttrMap: '{"nome_completo": "cn"}'
+    profileModule: 'servidores.Servidor'
   saberes:
-    moodleUrl: ''
-    moodleToken: ''
+    moodleUrl: 'https://saberes.senado.leg.br'
+    moodleToken: 'altereme'
 
 ingress:
   enabled: true