Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

[release-monitoring] Update production to F40

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

Signed-off-by: Michal Konecny <mkonecny@redhat.com>
This commit is contained in:
Michal Konecny 2024-05-30 10:41:59 +02:00
parent 93131deacb
commit de38802f46
2 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
roles/openshift-apps/release-monitoring/templates/buildconfig.yml
View file

@ -11,11 +11,7 @@ items:
runPolicy: Serial runPolicy: Serial
source: source:
dockerfile: |- dockerfile: |-
{% if env == 'staging' %}
FROM fedora:40 FROM fedora:40
{% else %}
FROM fedora:38
{% endif %}
LABEL \ LABEL \
name="release-monitoring-web" \ name="release-monitoring-web" \
vendor="Fedora Infrastructure" \ vendor="Fedora Infrastructure" \
@ -84,9 +80,7 @@ items:
# Hotfix for social_auth-sqlalchemy # Hotfix for social_auth-sqlalchemy
# Could be removed when we switch to something else # 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 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 mkdir /httpdir
RUN chmod 777 /httpdir RUN chmod 777 /httpdir
EXPOSE 8080 EXPOSE 8080

9
roles/openshift-apps/release-monitoring/templates/httpd.conf
View file

@ -27,11 +27,11 @@ StartServers 20
ServerLimit 100 ServerLimit 100
MaxRequestsPerChild 2000 MaxRequestsPerChild 2000
MaxRequestWorkers 100 MaxRequestWorkers 100
<Directory "/usr/local/lib/python3.11/anitya/static/docs/html/"> <Directory "/usr/local/lib/python3.12/anitya/static/docs/html/">
AllowOverride None AllowOverride None
Require all granted Require all granted
</Directory> </Directory>
<Directory "/usr/local/lib/python3.11/site-packages/anitya/static/"> <Directory "/usr/local/lib/python3.12/site-packages/anitya/static/">
AllowOverride None AllowOverride None
Require all granted Require all granted
</Directory> </Directory>
@ -55,13 +55,8 @@ LogLevel info
TypesConfig /etc/mime.types TypesConfig /etc/mime.types
AddDefaultCharset UTF-8 AddDefaultCharset UTF-8
CoreDumpDirectory /tmp CoreDumpDirectory /tmp
{% if env == "staging" %}
Alias /docs /usr/local/lib/python3.12/site-packages/anitya/static/docs/html/ Alias /docs /usr/local/lib/python3.12/site-packages/anitya/static/docs/html/
Alias /static /usr/local/lib/python3.12/site-packages/anitya/static/ 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 WSGIDaemonProcess anitya display-name=anitya processes=2 threads=2 maximum-requests=1000 home=/httpdir
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGISocketPrefix run/wsgi WSGISocketPrefix run/wsgi