From a5a3f05999ef96d93e796d54c4df6a750ac31f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Tue, 22 Nov 2022 12:51:22 +0100 Subject: [PATCH] FMN: fix sendria and sender-email containers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- roles/openshift-apps/fmn/files/service.yml | 3 ++ .../fmn/templates/Dockerfile-sendria | 2 +- .../fmn/templates/deploymentconfig.yml | 30 +++++++++---------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/roles/openshift-apps/fmn/files/service.yml b/roles/openshift-apps/fmn/files/service.yml index 92e0d35a76..c1a181cb3b 100644 --- a/roles/openshift-apps/fmn/files/service.yml +++ b/roles/openshift-apps/fmn/files/service.yml @@ -40,6 +40,9 @@ spec: - name: web port: 1080 targetPort: 1080 + - name: smtp + port: 1025 + targetPort: 1025 selector: app: fmn deploymentconfig: sendria diff --git a/roles/openshift-apps/fmn/templates/Dockerfile-sendria b/roles/openshift-apps/fmn/templates/Dockerfile-sendria index 9dd3692408..9eb319fed9 100644 --- a/roles/openshift-apps/fmn/templates/Dockerfile-sendria +++ b/roles/openshift-apps/fmn/templates/Dockerfile-sendria @@ -7,4 +7,4 @@ RUN mkdir -p .config/sendria RUN echo "[sendria]" > .config/sendria/config.toml RUN mkdir data ENV HOME=/home/sendria -ENTRYPOINT [ "sendria", "--foreground", "--db=./data/mails.sqlite", "--smtp-ip=0.0.0.0", "--http-ip=0.0.0.0" ] +ENTRYPOINT [ "/home/sendria/.local/bin/sendria", "--foreground", "--db=./data/mails.sqlite", "--smtp-ip=0.0.0.0", "--http-ip=0.0.0.0" ] diff --git a/roles/openshift-apps/fmn/templates/deploymentconfig.yml b/roles/openshift-apps/fmn/templates/deploymentconfig.yml index bbef061940..6ee5230aee 100644 --- a/roles/openshift-apps/fmn/templates/deploymentconfig.yml +++ b/roles/openshift-apps/fmn/templates/deploymentconfig.yml @@ -275,14 +275,14 @@ spec: - name: etc-fmn mountPath: "/etc/fmn" readOnly: true - - name: rabbitmq-ca-volume - mountPath: /etc/pki/rabbitmq/ca + - name: fedora-messaging-ca-volume + mountPath: /etc/pki/fedora-messaging/ca readOnly: true - - name: rabbitmq-key-volume - mountPath: /etc/pki/rabbitmq/key + - name: fedora-messaging-key-volume + mountPath: /etc/pki/fedora-messaging/key readOnly: true - - name: rabbitmq-crt-volume - mountPath: /etc/pki/rabbitmq/crt + - name: fedora-messaging-crt-volume + mountPath: /etc/pki/fedora-messaging/crt readOnly: true env: - name: APP_SCRIPT @@ -291,15 +291,15 @@ spec: - name: etc-fmn configMap: name: fmn - - name: rabbitmq-ca-volume - mountPath: /etc/pki/rabbitmq/ca - readOnly: true - - name: rabbitmq-key-volume - mountPath: /etc/pki/rabbitmq/key - readOnly: true - - name: rabbitmq-crt-volume - mountPath: /etc/pki/rabbitmq/crt - readOnly: true + - name: fedora-messaging-ca-volume + secret: + secretName: fedora-messaging-ca + - name: fedora-messaging-key-volume + secret: + secretName: fedora-messaging-key + - name: fedora-messaging-crt-volume + secret: + secretName: fedora-messaging-crt triggers: - type: ImageChange imageChangeParams: