From 1159e8ba67b5d0b524b479d72a14d72cb0931f70 Mon Sep 17 00:00:00 2001 From: Lisa Marie Date: Tue, 2 Jan 2024 22:51:10 +0100 Subject: [PATCH 1/4] Moved from namshi/smtp to ix-ai/smtp --- ansible/files/registry/list_of_docker_images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/files/registry/list_of_docker_images.txt b/ansible/files/registry/list_of_docker_images.txt index 4fd069d11..8bea8419f 100644 --- a/ansible/files/registry/list_of_docker_images.txt +++ b/ansible/files/registry/list_of_docker_images.txt @@ -42,7 +42,7 @@ mesosphere/aws-cli:1.14.5 metallb/controller:v0.7.3 metallb/speaker:v0.7.3 minio/minio:RELEASE.2023-07-07T07-13-57Z -namshi/smtp:latest +ixdotai/smtp:latest library/nginx:1.15 quay.io/coreos/configmap-reload:v0.0.1 quay.io/coreos/etcd:v3.2.26 From f0ba22cfad4cc733648032583423e4d60e808033 Mon Sep 17 00:00:00 2001 From: Lisa Marie Date: Tue, 2 Jan 2024 23:21:47 +0100 Subject: [PATCH 2/4] Upgraded documentation for upgrading.md --- offline/upgrading.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/offline/upgrading.md b/offline/upgrading.md index 65e66f379..5e192fcaa 100644 --- a/offline/upgrading.md +++ b/offline/upgrading.md @@ -47,7 +47,7 @@ sudo docker image ls | grep -E "^quay.io/wire/sftd" | sed "s/.*[ ]*\([0-9a-f]\{1 #### SFT Cluster If you are running a DMZ deployment, prune the old wire-server images and their dependencies on the SFT kubernetes hosts... ``` -sudo docker image ls | grep -E "^quay.io/wire/(team-settings|account|webapp|namshi-smtp)" | sed "s/.*[ ]*\([0-9a-f]\{12\}\).*/sudo docker image rm \1/" +sudo docker image ls | grep -E "^quay.io/wire/(team-settings|account|webapp|ixdotai-smtp)" | sed "s/.*[ ]*\([0-9a-f]\{12\}\).*/sudo docker image rm \1/" sudo docker image ls | grep -E "^(bitnami/redis|airdock/fake-sqs|localstack/localstack)" | sed "s/.*[ ]*\([0-9a-f]\{12\}\).*/sudo docker image rm \1/" ``` From 44617d8413c5d9f30cc433cf09f4c909d7de1e19 Mon Sep 17 00:00:00 2001 From: Lisa Marie Date: Thu, 11 Jan 2024 13:18:28 +0100 Subject: [PATCH 3/4] Added more documentation for smtp variables --- .../helm_vars/demo-smtp/values.yaml | 17 +++++++++++++++++ values/demo-smtp/prod-values.example.yaml | 19 ++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/examples/multi-node-k8s-with-lb-and-dns/helm_vars/demo-smtp/values.yaml b/examples/multi-node-k8s-with-lb-and-dns/helm_vars/demo-smtp/values.yaml index f4d2094b2..87cc4a162 100644 --- a/examples/multi-node-k8s-with-lb-and-dns/helm_vars/demo-smtp/values.yaml +++ b/examples/multi-node-k8s-with-lb-and-dns/helm_vars/demo-smtp/values.yaml @@ -2,5 +2,22 @@ # https://github.com/kubernetes-sigs/kubespray/blob/master/docs/calico.md#optional--define-the-default-pool-cidr # or flannel's https://github.com/kubernetes-sigs/kubespray/blob/master/docs/flannel.md#flannel # If you override those values, etc., then verify that this CIDR still makes sense +# For all variables the "ixdotai/smtp" image supports see: https://github.com/ix-ai/smtp#readme envVars: RELAY_NETWORKS: ":10.233.0.0/16" +# +# PORT: "25" +# NET_DEV: eth0 +# OTHER_HOSTNAMES: other.example.com +# DISABLE_IPV6: 1 +# BIND_IP: 0.0.0.0 +# BIND_IP6: ::0 +# MAILNAME: mail.example.com +# DKIM_KEY_PATH: /etc/exim4/dkim.key +# KEY_PATH: /path/to/key.crt +# CERTIFICATE_PATH: /path/to/certificate.crt +# SMARTHOST_ADDRESS: mail.example.com +# SMARTHOST_PORT: "587" +# SMARTHOST_USER: exampleuser +# SMARTHOST_PASSWORD: secret +# SMARTHOST_ALIASES: "*.example.com" diff --git a/values/demo-smtp/prod-values.example.yaml b/values/demo-smtp/prod-values.example.yaml index 9a8950f08..87cc4a162 100644 --- a/values/demo-smtp/prod-values.example.yaml +++ b/values/demo-smtp/prod-values.example.yaml @@ -1,6 +1,23 @@ # CHANGEME-PROD: This is often a good default when using calico's default CIDR # https://github.com/kubernetes-sigs/kubespray/blob/master/docs/calico.md#optional--define-the-default-pool-cidr # or flannel's https://github.com/kubernetes-sigs/kubespray/blob/master/docs/flannel.md#flannel -# If you overrride those values, etc., then verify that this CIDR still makes sense +# If you override those values, etc., then verify that this CIDR still makes sense +# For all variables the "ixdotai/smtp" image supports see: https://github.com/ix-ai/smtp#readme envVars: RELAY_NETWORKS: ":10.233.0.0/16" +# +# PORT: "25" +# NET_DEV: eth0 +# OTHER_HOSTNAMES: other.example.com +# DISABLE_IPV6: 1 +# BIND_IP: 0.0.0.0 +# BIND_IP6: ::0 +# MAILNAME: mail.example.com +# DKIM_KEY_PATH: /etc/exim4/dkim.key +# KEY_PATH: /path/to/key.crt +# CERTIFICATE_PATH: /path/to/certificate.crt +# SMARTHOST_ADDRESS: mail.example.com +# SMARTHOST_PORT: "587" +# SMARTHOST_USER: exampleuser +# SMARTHOST_PASSWORD: secret +# SMARTHOST_ALIASES: "*.example.com" From 72d64338f17545a3b233fe0c134d29dc8ea7dee0 Mon Sep 17 00:00:00 2001 From: Lisa Marie Date: Thu, 11 Jan 2024 13:20:29 +0100 Subject: [PATCH 4/4] Updated docker image list --- ansible/files/registry/list_of_docker_images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/files/registry/list_of_docker_images.txt b/ansible/files/registry/list_of_docker_images.txt index 8bea8419f..28ddcb095 100644 --- a/ansible/files/registry/list_of_docker_images.txt +++ b/ansible/files/registry/list_of_docker_images.txt @@ -42,7 +42,7 @@ mesosphere/aws-cli:1.14.5 metallb/controller:v0.7.3 metallb/speaker:v0.7.3 minio/minio:RELEASE.2023-07-07T07-13-57Z -ixdotai/smtp:latest +ixdotai/smtp:v0.5.2 library/nginx:1.15 quay.io/coreos/configmap-reload:v0.0.1 quay.io/coreos/etcd:v3.2.26