Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wpb 5064 #674

Merged
merged 4 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/files/registry/list_of_docker_images.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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:v0.5.2
library/nginx:1.15
quay.io/coreos/configmap-reload:v0.0.1
quay.io/coreos/etcd:v3.2.26
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion offline/upgrading.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
```

Expand Down
19 changes: 18 additions & 1 deletion values/demo-smtp/prod-values.example.yaml
Original file line number Diff line number Diff line change
@@ -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"
Loading