diff --git a/charts/portalmodelo/v0.5.0/questions.yaml b/charts/portalmodelo/v0.5.0/questions.yaml index f69fbdc..f17220a 100644 --- a/charts/portalmodelo/v0.5.0/questions.yaml +++ b/charts/portalmodelo/v0.5.0/questions.yaml @@ -149,6 +149,14 @@ questions: required: false group: Avançado +- variable: portal.zopefolder + default: "/" + type: string + description: "Diretório no Zope onde está armazenado o portal. Precisa terminar com barra '/'." + label: "Zope Folder" + required: false + group: Avançado + - variable: instance.zeoclient default: true type: boolean diff --git a/charts/portalmodelo/v0.5.0/templates/ingress.yaml b/charts/portalmodelo/v0.5.0/templates/ingress.yaml index 6f34453..8196915 100644 --- a/charts/portalmodelo/v0.5.0/templates/ingress.yaml +++ b/charts/portalmodelo/v0.5.0/templates/ingress.yaml @@ -2,6 +2,7 @@ {{- $fullName := include "portalmodelo.fullname" . -}} {{- $hostName := .Values.portal.hostname -}} {{- $hostPrefix := .Values.portal.hostprefix -}} +{{- $zopeFolder := .Values.portal.zopefolder -}} {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} @@ -19,7 +20,7 @@ metadata: cert-manager.io/cluster-issuer: "letsencrypt-prod" {{- end }} {{- if contains "nginx" .Values.ingress.class }} - nginx.ingress.kubernetes.io/rewrite-target: "/VirtualHostBase/https/{{ $hostPrefix }}.{{ $hostName }}:443/portal/VirtualHostRoot/$1" + nginx.ingress.kubernetes.io/rewrite-target: "/VirtualHostBase/https/{{ $hostPrefix }}.{{ $hostName }}:443{{ $zopeFolder }}portal/VirtualHostRoot/$1" nginx.ingress.kubernetes.io/from-to-www-redirect: "true" nginx.ingress.kubernetes.io/service-upstream: "true" {{- end }} @@ -30,7 +31,7 @@ metadata: {{- else }} # DO NOT USE TLS {{- if contains "nginx" .Values.ingress.class }} - nginx.ingress.kubernetes.io/rewrite-target: "/VirtualHostBase/http/{{ $hostPrefix }}.{{ $hostName }}:80/portal/VirtualHostRoot/$1" + nginx.ingress.kubernetes.io/rewrite-target: "/VirtualHostBase/http/{{ $hostPrefix }}.{{ $hostName }}:80{{ $zopeFolder }}portal/VirtualHostRoot/$1" {{- end }} {{- if contains "alb" .Values.ingress.class }} alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}]' diff --git a/charts/portalmodelo/v0.5.0/values.yaml b/charts/portalmodelo/v0.5.0/values.yaml index 48a0f43..0c0b419 100644 --- a/charts/portalmodelo/v0.5.0/values.yaml +++ b/charts/portalmodelo/v0.5.0/values.yaml @@ -41,6 +41,7 @@ portal: hostprefix: www timeZone: America/Sao_Paulo createAndUpgrade: true + zopefolder: '/' instance: zodbCacheSize: 1000