From de38802f4663967d0a9c9c00001b75374dbcecea Mon Sep 17 00:00:00 2001
From: Michal Konecny <mkonecny@redhat.com>
Date: Thu, 30 May 2024 10:41:59 +0200
Subject: [PATCH] [release-monitoring] Update production to F40

With the release 1.10.0 we can update the machine to Fedora 40.

Signed-off-by: Michal Konecny <mkonecny@redhat.com>
---
 .../release-monitoring/templates/buildconfig.yml         | 6 ------
 .../release-monitoring/templates/httpd.conf              | 9 ++-------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml
index 94f4a9034e..3621a25fdb 100644
--- a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml
+++ b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml
@@ -11,11 +11,7 @@ items:
     runPolicy: Serial
     source:
       dockerfile: |-
-{% if env == 'staging' %}
         FROM fedora:40
-{% else %}
-        FROM fedora:38
-{% endif %}
         LABEL \
           name="release-monitoring-web" \
           vendor="Fedora Infrastructure" \
@@ -84,9 +80,7 @@ items:
 
         # Hotfix for social_auth-sqlalchemy
         # Could be removed when we switch to something else
-{% if env == 'staging' %}
         RUN sed -i 's/base64.encodestring/base64.encodebytes/g' /usr/local/lib/python3.12/site-packages/social_sqlalchemy/storage.py
-{% endif %}
         RUN mkdir /httpdir
         RUN chmod 777 /httpdir
         EXPOSE 8080
diff --git a/roles/openshift-apps/release-monitoring/templates/httpd.conf b/roles/openshift-apps/release-monitoring/templates/httpd.conf
index 32517eaedc..a77783aa36 100644
--- a/roles/openshift-apps/release-monitoring/templates/httpd.conf
+++ b/roles/openshift-apps/release-monitoring/templates/httpd.conf
@@ -27,11 +27,11 @@ StartServers  20
 ServerLimit   100
 MaxRequestsPerChild 2000
 MaxRequestWorkers 100
-<Directory "/usr/local/lib/python3.11/anitya/static/docs/html/">
+<Directory "/usr/local/lib/python3.12/anitya/static/docs/html/">
   AllowOverride None
   Require all granted
 </Directory>
-<Directory "/usr/local/lib/python3.11/site-packages/anitya/static/">
+<Directory "/usr/local/lib/python3.12/site-packages/anitya/static/">
   AllowOverride None
   Require all granted
 </Directory>
@@ -55,13 +55,8 @@ LogLevel info
 TypesConfig /etc/mime.types
 AddDefaultCharset UTF-8
 CoreDumpDirectory /tmp
-{% if env == "staging" %}
 Alias /docs /usr/local/lib/python3.12/site-packages/anitya/static/docs/html/
 Alias /static /usr/local/lib/python3.12/site-packages/anitya/static/
-{% else %}
-Alias /docs /usr/local/lib/python3.11/site-packages/anitya/static/docs/html/
-Alias /static /usr/local/lib/python3.11/site-packages/anitya/static/
-{% endif %}
 WSGIDaemonProcess anitya display-name=anitya processes=2 threads=2 maximum-requests=1000 home=/httpdir
 WSGIApplicationGroup %{GLOBAL}
 WSGISocketPrefix run/wsgi