From f26baf7de2dd5c3b60c2a707343989f9fbec72ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Tue, 3 Sep 2024 09:57:32 +0200
Subject: [PATCH] Deploy webhook-to-fedora-messaging to prod
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 .../host_vars/db01.iad2.fedoraproject.org     | 14 ++++++-----
 playbooks/include/proxies-reverseproxy.yml    | 11 +++++++++
 playbooks/include/proxies-websites.yml        | 11 +++++++--
 roles/apps-fp-o/files/apps.yaml               | 24 ++++++++-----------
 4 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/inventory/host_vars/db01.iad2.fedoraproject.org b/inventory/host_vars/db01.iad2.fedoraproject.org
index 9941eb2b8b..ee9460e57c 100644
--- a/inventory/host_vars/db01.iad2.fedoraproject.org
+++ b/inventory/host_vars/db01.iad2.fedoraproject.org
@@ -18,10 +18,11 @@ databases:
   - notifications
   - odcs
   - pagure
-  - tahrir
-  - waiverdb
-  - transtats
   - resultsdb
+  - tahrir
+  - transtats
+  - waiverdb
+  - webhook2fedmsg
   - zezere
 datacenter: iad2
 db_backup_dir: ['/backups']
@@ -40,10 +41,11 @@ dbs_to_backup:
   - notifications
   - odcs
   - pagure
-  - tahrir
-  - waiverdb
-  - transtats
   - resultsdb
+  - tahrir
+  - transtats
+  - waiverdb
+  - webhook2fedmsg
   - zezere
 # Should be 0.80 of memory
 effective_cache_size: "50GB"
diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index bcdc0bc3a3..7e87a620c6 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -941,3 +941,14 @@
     ocp4: true
     tags:
     - fedoraplanet
+
+  - role: httpd/reverseproxy
+    website: "webhook{{ env_suffix }}.fedoraproject.org"
+    destname: webhook2fedmsg
+    balancer_name: apps-ocp
+    balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}"
+    targettype: openshift
+    keephost: true
+    ocp4: true
+    tags:
+    - webhook2fedmsg
diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index 6dea37933f..70b3925b1b 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -1195,7 +1195,7 @@
     sslonly: true
     certbot: true
     tags:
-      - epel.io
+    - epel.io
 
   - role: httpd/website
     site_name: "fedoraplanet.org"
@@ -1205,4 +1205,11 @@
     sslonly: true
     certbot: true
     tags:
-      - fedoraplanet.org
+    - fedoraplanet.org
+
+  - role: httpd/website
+    site_name: "webhook{{ env_suffix }}.fedoraproject.org"
+    sslonly: true
+    cert_name: "{{wildcard_cert_name}}"
+    tags:
+    - webhook2fedmsg
diff --git a/roles/apps-fp-o/files/apps.yaml b/roles/apps-fp-o/files/apps.yaml
index f48271d5fc..cb5fa12226 100644
--- a/roles/apps-fp-o/files/apps.yaml
+++ b/roles/apps-fp-o/files/apps.yaml
@@ -457,24 +457,20 @@ children:
             then be responsible for filing bugs, attempting to
             automatically build packages, perform some preliminary QA
             checks, etc..
-    - name: github2fedmsg
+    - name: Webhook to Fedora Messaging
       data:
-        icon: github.png
-        url: https://apps.fedoraproject.org/github2fedmsg
-        source_url: https://github.com/fedora-infra/github2fedmsg
-        bugs_url: https://github.com/fedora-infra/github2fedmsg/issues
+        url: https://webhook.fedoraproject.org/
+        source_url: https://github.com/fedora-infra/webhook-to-fedora-messaging
+        bugs_url: https://github.com/fedora-infra/webhook-to-fedora-messaging/issues
         docs_url: >
-            https://github.com/fedora-infra/github2fedmsg/blob/develop/README.rst#github2fedmsg
+            https://github.com/fedora-infra/webhook-to-fedora-messaging/
         sops:
-        - https://infrastructure.fedoraproject.org/infra/docs/github2fedmsg.rst
-        status_mappings: ['fedmsg']
+        - https://docs.fedoraproject.org/en-US/infra/sysadmin_guide/webhook2fedmsg/
         description: >
-            github2fedmsg is a web service that bridges upstream
-            development activity from <a
-            href="https://github.com">GitHub</a> into the <a
-            href="https://fedmsg.readthedocs.io/">Fedora Infrastructure message
-            bus</a>.  Visit the self-service dashboard to toggle the
-            status of your repositories.
+            Webhook to Fedora Messaging is a web service that bridges upstream
+            activity into the <a href="https://fedora-messaging.readthedocs.io/"
+            >Fedora Infrastructure message bus</a>. Visit the self-service
+            dashboard to add your application.
     - name: Pagure
       data:
         icon: pagure.png