From 17ebc2e718cf4e3a245de36c1f59f4eee018fbe0 Mon Sep 17 00:00:00 2001
From: Fabio Rauber <fabiorauber@gmail.com>
Date: Fri, 6 Aug 2021 11:17:07 -0300
Subject: [PATCH] Fix issue with ingress and vhostmonster

---
 charts/portalmodelo/v0.5.0/templates/ingress.yaml | 6 +++++-
 charts/sapl/v0.2.0/questions.yaml                 | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/charts/portalmodelo/v0.5.0/templates/ingress.yaml b/charts/portalmodelo/v0.5.0/templates/ingress.yaml
index d690920..49e31c8 100644
--- a/charts/portalmodelo/v0.5.0/templates/ingress.yaml
+++ b/charts/portalmodelo/v0.5.0/templates/ingress.yaml
@@ -65,8 +65,12 @@ spec:
               serviceName: ssl-redirect
               servicePort: use-annotation
           {{- end }}
-          {{- if and (contains "nginx" .Values.ingress.class) (.Values.ingress.vhostmonster) }}
+          {{- if contains "nginx" .Values.ingress.class }}
+          {{-   if .Values.ingress.vhostmonster }}
           - path: /(.*)
+          {{-   else }}
+          - path: /
+          {{-   end }}
           {{- else }}
           - path: /*
           {{- end }}
diff --git a/charts/sapl/v0.2.0/questions.yaml b/charts/sapl/v0.2.0/questions.yaml
index cc622c0..72a72f9 100644
--- a/charts/sapl/v0.2.0/questions.yaml
+++ b/charts/sapl/v0.2.0/questions.yaml
@@ -20,8 +20,8 @@ questions:
   required: true
 - variable: sapl.adminPassword
   default: "altereme"
-  description: "Senha do usuário adm do Plone"
-  label: Senha Adm
+  description: "Senha do usuário administrativo do SAPL"
+  label: Senha Admin
   type: password
   group: Básico
   required: true