installer: maddy cleanup mta-sts
diff --git a/charts/maddy/templates/install.yaml b/charts/maddy/templates/install.yaml
index e84ef16..ccc423a 100644
--- a/charts/maddy/templates/install.yaml
+++ b/charts/maddy/templates/install.yaml
@@ -164,7 +164,6 @@
- maddy-web
- --port=80
- --maddy-config=/etc/maddy/config/maddy.conf
- - --export-dkim=/var/lib/maddy/dkim_keys/{{ .Values.ingress.public.domain }}_default.dns
volumeMounts:
- name: config
mountPath: /etc/maddy/config
@@ -175,104 +174,3 @@
- name: data
mountPath: /var/lib/maddy
readOnly: false
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: mta-sts
- namespace: {{ .Release.Namespace }}
-data:
- mta-sts.txt: |
- version: STSv1
- mode: enforce
- max_age: 604800
- mx: {{ .Values.mailGateway.mxHostname }}
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: mta-sts
- namespace: {{ .Release.Namespace }}
-spec:
- selector:
- matchLabels:
- app: mta-sts
- replicas: 1
- template:
- metadata:
- labels:
- app: mta-sts
- spec:
- volumes:
- - name: mta-sts
- configMap:
- name: mta-sts
- containers:
- - name: maddy
- image: giolekva/static-file-server:latest
- imagePullPolicy: Always
- ports:
- - name: http
- containerPort: 80
- protocol: TCP
- command:
- - static-file-server
- - --port=80
- - --dir=/etc/static-file-server/data
- volumeMounts:
- - name: mta-sts
- mountPath: /etc/static-file-server/data/.well-known
- readOnly: true
----
-apiVersion: v1
-kind: Service
-metadata:
- name: mta-sts
- namespace: {{ .Release.Namespace }}
-spec:
- type: ClusterIP
- selector:
- app: mta-sts
- ports:
- - name: http
- port: 80
- targetPort: http
- protocol: TCP
----
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
- name: mta-sts.{{ .Values.ingress.public.domain }}
- namespace: {{ .Release.Namespace }}
- annotations:
- helm.sh/resource-policy: keep
-spec:
- dnsNames:
- - 'mta-sts.{{ .Values.ingress.public.domain }}'
- issuerRef:
- name: {{ .Values.ingress.public.certificateIssuer }}
- kind: ClusterIssuer
- secretName: cert-mta-sts.{{ .Values.ingress.public.domain }}
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- name: mta-sts
- namespace: {{ .Release.Namespace }}
-spec:
- ingressClassName: {{ .Values.ingress.public.className }}
- tls:
- - hosts:
- - mta-sts.{{ .Values.ingress.public.domain }}
- secretName: cert-mta-sts.{{ .Values.ingress.public.domain }}
- rules:
- - host: mta-sts.{{ .Values.ingress.public.domain }}
- http:
- paths:
- - pathType: Prefix
- path: "/"
- backend:
- service:
- name: mta-sts
- port:
- name: http
diff --git a/charts/maddy/templates/mta-sts.yaml b/charts/maddy/templates/mta-sts.yaml
index dd57797..c44e3dd 100644
--- a/charts/maddy/templates/mta-sts.yaml
+++ b/charts/maddy/templates/mta-sts.yaml
@@ -9,7 +9,7 @@
version: STSv1
mode: enforce
max_age: 604800
- mx: {{ .Values.mailGateway.mxHostname}}
+ mx: {{ .Values.mailGateway.mxHostname }}
---
apiVersion: cert-manager.io/v1
kind: Certificate