From 0972492ebd5a39f7d3495d7d6ed7465d9aef8d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Wed, 19 Apr 2023 18:00:24 +0200 Subject: [PATCH] FMN: expose at notifications.fp.o MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- playbooks/include/proxies-reverseproxy.yml | 11 +++++++++++ playbooks/include/proxies-websites.yml | 7 +++++++ playbooks/openshift-apps/fmn.yml | 8 ++++++++ 3 files changed, 26 insertions(+) diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index d4e8be428c..b53c54a691 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -140,6 +140,17 @@ header_scheme: true proxyurl: http://localhost:10036 + - role: httpd/reverseproxy + website: "notifications{{ env_suffix }}.fedoraproject.org" + destname: fmn + balancer_name: apps-ocp + balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}" + targettype: openshift + keephost: true + ocp4: true + tags: + - fmn + - role: httpd/reverseproxy website: ask.fedoraproject.org destname: askbot diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 9f69e20034..e8e979a434 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -617,6 +617,13 @@ gzip: true cert_name: "{{wildcard_cert_name}}" + - role: httpd/website + site_name: "notifications{{ env_suffix }}.fedoraproject.org" + sslonly: true + cert_name: "{{wildcard_cert_name}}" + tags: + - fmn + - role: httpd/website site_name: pdc.fedoraproject.org server_aliases: [pdc.stg.fedoraproject.org] diff --git a/playbooks/openshift-apps/fmn.yml b/playbooks/openshift-apps/fmn.yml index 89c40693f8..c6bfa73e18 100644 --- a/playbooks/openshift-apps/fmn.yml +++ b/playbooks/openshift-apps/fmn.yml @@ -138,6 +138,14 @@ objectname: service.yml # Routes + - role: openshift/route + app: fmn + routename: frontend + host: "notifications{{ env_suffix }}.fedoraproject.org" + servicename: frontend + serviceport: web + annotations: + haproxy.router.openshift.io/timeout: 5m - role: openshift/route app: fmn routename: frontend