diff --git a/mailman3/templates/NOTES.txt b/mailman3/templates/NOTES.txt index 0487411..e780962 100644 --- a/mailman3/templates/NOTES.txt +++ b/mailman3/templates/NOTES.txt @@ -1,6 +1,6 @@ {{- if .Values.ingress.enabled }} Application URL: - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ .Values.ingress.host }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ .Values.hostname }} {{- else if contains "NodePort" .Values.service.type }} Get the application URL by running these commands: export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "mailman3.fullname" . }}) diff --git a/mailman3/templates/core.yaml b/mailman3/templates/core.yaml index 9606e8f..2e90695 100644 --- a/mailman3/templates/core.yaml +++ b/mailman3/templates/core.yaml @@ -39,6 +39,8 @@ spec: image: "{{ .Values.core.image.repository }}:{{ .Values.core.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.core.image.pullPolicy }} env: +# - name: TZ +# value: 'Europe/Berlin' - name: HYPERKITTY_API_KEY value: {{ .Values.hyperkittyApiKey }} - name: HYPERKITTY_URL diff --git a/mailman3/templates/ingress.yaml b/mailman3/templates/ingress.yaml index 7a255ec..bfa754a 100644 --- a/mailman3/templates/ingress.yaml +++ b/mailman3/templates/ingress.yaml @@ -19,11 +19,11 @@ spec: {{- if .Values.ingress.tls }} tls: - hosts: - - {{ .Values.ingress.host }} + - {{ .Values.hostname }} secretName: {{ include "mailman3.fullname" . }}-certificate {{- end }} rules: - - host: {{ .Values.ingress.host | quote }} + - host: {{ .Values.hostname | quote }} http: paths: - path: / diff --git a/mailman3/templates/web.yaml b/mailman3/templates/web.yaml index af9fc41..d1ea1cd 100644 --- a/mailman3/templates/web.yaml +++ b/mailman3/templates/web.yaml @@ -49,7 +49,7 @@ spec: value: http://{{ include "mailman3.fullname" . }}-web.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:80 {{- if .Values.ingress.enabled }} - name: SERVE_FROM_DOMAIN - value: {{ .Values.ingress.host | quote }} + value: {{ .Values.hostname | quote }} {{- end }} - name: DATABASE_URL value: sqlite://///opt/mailman-web-data/mailmanweb.db diff --git a/mailman3/values.yaml b/mailman3/values.yaml index c25b798..70ae91b 100644 --- a/mailman3/values.yaml +++ b/mailman3/values.yaml @@ -12,6 +12,8 @@ #hyperkittyApiKey: supersecret #djangoSecretKey: supersecret +hostname: lists.example.org + imagePullSecrets: [] nameOverride: "" fullnameOverride: "" @@ -44,6 +46,7 @@ core: # cpu: 100m # memory: 128Mi persistence: + # persistence.existingClaim: ... size: 100Gi accessMode: ReadWriteOnce @@ -58,6 +61,7 @@ web: affinity: {} resources: {} persistence: + # persistence.existingClaim: ... size: 100Gi accessMode: ReadWriteOnce @@ -72,9 +76,3 @@ ingress: #kubernetes.io/ingress.class: "nginx" # use Cert-Manager for LetsEncrypt Certificates #cert-manager.io/issuer: "letsencrypt-prod" - host: mailman3.example.org - - - - -