Skip to content

Commit 24f8d14

Browse files
authored
feat: add mailman-ietf-styles plugin support
2 parents c235027 + 8525b89 commit 24f8d14

File tree

5 files changed

+30
-2
lines changed

5 files changed

+30
-2
lines changed

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ USER root
44

55
ENV MAILMAN_VERSION 3.3.10
66
ENV MAILARCHIVE_VERSION git+https://github.com/sargeant/mailman-mailarchive.git@v1.1.1
7+
ENV IETF_STYLES_VERSION git+https://github.com/ietf-tools/mailman-ietf-styles.git@main
78

89
RUN apk update \
910
&& apk add --virtual build-deps gcc python3-dev musl-dev linux-headers \
@@ -13,6 +14,7 @@ RUN apk update \
1314
&& python3 -m pip install --break-system-packages \
1415
mailman==${MAILMAN_VERSION} \
1516
${MAILARCHIVE_VERSION} \
17+
${IETF_STYLES_VERSION} \
1618
'importlib-resources<6.0.0' \
1719
&& apk del build-deps \
1820
&& adduser -S mailman

charts/mailman/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ description: IETF mailman deployment for kubernetes
44

55
type: application
66

7-
version: 1.0.3
7+
version: 1.0.4
88

9-
appVersion: "1.0.3"
9+
appVersion: "1.0.4"

charts/mailman/templates/deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ spec:
100100
secretKeyRef:
101101
name: {{ tpl .Values.mailman.mailarchiver.destination.existingSecretName . }}
102102
key: {{ tpl .Values.mailman.mailarchiver.destination.existingSecretKey . }}
103+
{{- if .Values.mailman.globalAllowlistFqdn }}
104+
- name: GLOBAL_ALLOWLIST_FQDN
105+
value: "{{ .Values.mailman.globalAllowlistFqdn }}"
106+
{{- end }}
103107
- name: MAILMAN_REST_USER
104108
valueFrom:
105109
secretKeyRef:

charts/mailman/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ mailman:
4848
count: 1
4949
digest:
5050
count: 1
51+
globalAllowlistFqdn: ""
5152
arc:
5253
enabled: false
5354
domain: mydomain.com

docker-entrypoint.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,27 @@ echo "MAILARCHIVE_API_KEY not defined, skipping IETF Mail Archive setup..."
317317

318318
fi
319319

320+
if [[ -v GLOBAL_ALLOWLIST_FQDN ]]; then
321+
322+
echo "GLOBAL_ALLOWLIST_FQDN found, setting up IETF styles plugin..."
323+
324+
cat >> /etc/mailman.cfg << EOF
325+
[plugin.ietf_styles]
326+
class: mailman_ietf_styles.plugin.IETFStylesPlugin
327+
enabled: yes
328+
component_package: mailman_ietf_styles
329+
330+
[styles]
331+
default: ietf-default
332+
333+
EOF
334+
335+
else
336+
337+
echo "GLOBAL_ALLOWLIST_FQDN not defined, skipping IETF styles plugin..."
338+
339+
fi
340+
320341
# setup runner numbers
321342

322343
cat >> /etc/mailman.cfg << EOF

0 commit comments

Comments
 (0)