From 86af4472adaac6625d62507bcb83caf15943d5b3 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Nov 21 2022 11:31:11 +0000
Subject: FMN: fix ports and rename config file


Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

---

diff --git a/roles/openshift-apps/fmn/files/service.yml b/roles/openshift-apps/fmn/files/service.yml
index 5270eda..92e0d35 100644
--- a/roles/openshift-apps/fmn/files/service.yml
+++ b/roles/openshift-apps/fmn/files/service.yml
@@ -23,8 +23,8 @@ metadata:
 spec:
   ports:
     - name: web
-      port: 8081
-      targetPort: 8081
+      port: 8080
+      targetPort: 8080
   selector:
     app: fmn
     deploymentconfig: api
diff --git a/roles/openshift-apps/fmn/templates/configmap.yml b/roles/openshift-apps/fmn/templates/configmap.yml
index fe26120..76a7b97 100644
--- a/roles/openshift-apps/fmn/templates/configmap.yml
+++ b/roles/openshift-apps/fmn/templates/configmap.yml
@@ -15,5 +15,5 @@ items:
       {{ load_file('fmn.cfg') | indent(6) }}
     consumer.toml: |-
       {{ load_file('consumer.toml') | indent(6) }}
-    sender.toml: |-
-      {{ load_file('sender.toml') | indent(6) }}
+    sender-email.toml: |-
+      {{ load_file('sender-email.toml') | indent(6) }}
diff --git a/roles/openshift-apps/fmn/templates/deploymentconfig.yml b/roles/openshift-apps/fmn/templates/deploymentconfig.yml
index 5951de5..b8bfca3 100644
--- a/roles/openshift-apps/fmn/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/fmn/templates/deploymentconfig.yml
@@ -39,13 +39,13 @@ spec:
               value: ".s2i/run-frontend.sh"
           readinessProbe:
             timeoutSeconds: 1
-            initialDelaySeconds: 10
+            initialDelaySeconds: 5
             httpGet:
               path: /
               port: 8080
           livenessProbe:
             timeoutSeconds: 1
-            initialDelaySeconds: 5
+            initialDelaySeconds: 20
             httpGet:
               path: /
               port: 8080
@@ -94,7 +94,7 @@ spec:
         - name: api
           imagePullPolicy: Always
           ports:
-            - containerPort: 8081
+            - containerPort: 8080
           volumeMounts:
             - name: etc-fmn
               mountPath: "/etc/fmn"
@@ -125,6 +125,19 @@ spec:
             - name: KRB5_CLIENT_KTNAME
               value: /etc/keytabs/service.keytab
 
+          readinessProbe:
+            timeoutSeconds: 1
+            initialDelaySeconds: 5
+            httpGet:
+              path: /
+              port: 8080
+          livenessProbe:
+            timeoutSeconds: 1
+            initialDelaySeconds: 20
+            httpGet:
+              path: /
+              port: 8080
+
       volumes:
         - name: etc-fmn
           configMap:
diff --git a/roles/openshift-apps/fmn/templates/sender-email.toml b/roles/openshift-apps/fmn/templates/sender-email.toml
new file mode 100644
index 0000000..ccf1f36
--- /dev/null
+++ b/roles/openshift-apps/fmn/templates/sender-email.toml
@@ -0,0 +1,51 @@
+# A sample configuration for the FMN sender. This file is in the TOML format.
+
+amqp_url = "amqps://fmn{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Ffmn"
+queue = "email"
+
+[tls]
+ca_cert = "/etc/pki/fedora-messaging/ca/cacert.pem"
+certfile = "/etc/pki/fedora-messaging/crt/fmn-cert.pem"
+keyfile = "/etc/pki/fedora-messaging/key/fmn-key.pem"
+
+[handler]
+class = "fmn.sender.email:EmailHandler"
+# class = "fmn.sender.irc:IRCHandler"
+from = "FMN <fmn{{ env_suffix }}@fedoraproject.org>"
+# smtp_host = "bastion{{ env_suffix }}.iad2.fedoraproject.org"
+smtp_host = "sendria.fmn.svc.cluster.local"
+smtp_port = 1025
+# irc_url = "ircs://fedora-notif:fmnpassword@irc.libera.chat:6697"
+
+[log_config]
+version = 1
+disable_existing_loggers = true
+
+[log_config.formatters.simple]
+format = "[%(levelname)s %(name)s] %(message)s"
+
+[log_config.handlers.console]
+class = "logging.StreamHandler"
+formatter = "simple"
+stream = "ext://sys.stdout"
+
+[log_config.loggers.fmn]
+level = "DEBUG"
+propagate = false
+handlers = ["console"]
+
+# Pika is the underlying AMQP client library. When debugging you may want to
+# lower this log level.
+[log_config.loggers.pika]
+level = "WARNING"
+propagate = false
+handlers = ["console"]
+
+[log_config.loggers.irc]
+level = "DEBUG"
+propagate = false
+handlers = ["console"]
+
+[log_config.root]
+level = "ERROR"
+handlers = ["console"]
diff --git a/roles/openshift-apps/fmn/templates/sender.toml b/roles/openshift-apps/fmn/templates/sender.toml
deleted file mode 100644
index ccf1f36..0000000
--- a/roles/openshift-apps/fmn/templates/sender.toml
+++ /dev/null
@@ -1,51 +0,0 @@
-# A sample configuration for the FMN sender. This file is in the TOML format.
-
-amqp_url = "amqps://fmn{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Ffmn"
-queue = "email"
-
-[tls]
-ca_cert = "/etc/pki/fedora-messaging/ca/cacert.pem"
-certfile = "/etc/pki/fedora-messaging/crt/fmn-cert.pem"
-keyfile = "/etc/pki/fedora-messaging/key/fmn-key.pem"
-
-[handler]
-class = "fmn.sender.email:EmailHandler"
-# class = "fmn.sender.irc:IRCHandler"
-from = "FMN <fmn{{ env_suffix }}@fedoraproject.org>"
-# smtp_host = "bastion{{ env_suffix }}.iad2.fedoraproject.org"
-smtp_host = "sendria.fmn.svc.cluster.local"
-smtp_port = 1025
-# irc_url = "ircs://fedora-notif:fmnpassword@irc.libera.chat:6697"
-
-[log_config]
-version = 1
-disable_existing_loggers = true
-
-[log_config.formatters.simple]
-format = "[%(levelname)s %(name)s] %(message)s"
-
-[log_config.handlers.console]
-class = "logging.StreamHandler"
-formatter = "simple"
-stream = "ext://sys.stdout"
-
-[log_config.loggers.fmn]
-level = "DEBUG"
-propagate = false
-handlers = ["console"]
-
-# Pika is the underlying AMQP client library. When debugging you may want to
-# lower this log level.
-[log_config.loggers.pika]
-level = "WARNING"
-propagate = false
-handlers = ["console"]
-
-[log_config.loggers.irc]
-level = "DEBUG"
-propagate = false
-handlers = ["console"]
-
-[log_config.root]
-level = "ERROR"
-handlers = ["console"]