diff --git a/inventory/group_vars/os_masters b/inventory/group_vars/os_masters index 9e9f87e687..4acf6cc835 100644 --- a/inventory/group_vars/os_masters +++ b/inventory/group_vars/os_masters @@ -22,5 +22,5 @@ sar_openshift: # Output file on local machine sar_output_file: anitya.json # Location of the script - sar_script: /usr/local/bin/sar.py + sar_script: /usr/local/bin/sar swap: false diff --git a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml index 59d854fbdb..e47c6c1202 100644 --- a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml +++ b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml @@ -55,8 +55,6 @@ items: pushd anitya && \ {% if env == 'staging' %} git checkout staging && \ - poetry export -f requirements.txt --output requirements.txt --without-hashes && \ - pip-3 install -r requirements.txt && \ poetry build && \ pip-3 install dist/*.whl && \ {% else %} @@ -72,12 +70,12 @@ items: popd && \ {% if env != 'staging' %} python3 setup.py install && \ - pip-3 install . && \ {% endif %} + pip-3 install . && \ popd && \ rm -rf anitya - # Let's use staging auth server in staging {% if env == 'staging' %} + # Let's use staging auth server in staging RUN sed -i 's/id.fedoraproject.org/id.stg.fedoraproject.org/g' /usr/local/lib/python3.10/site-packages/social_core/backends/fedora.py {% endif %} diff --git a/roles/openshift-apps/release-monitoring/templates/httpd.conf b/roles/openshift-apps/release-monitoring/templates/httpd.conf index 551c6ef198..67aae00b9d 100644 --- a/roles/openshift-apps/release-monitoring/templates/httpd.conf +++ b/roles/openshift-apps/release-monitoring/templates/httpd.conf @@ -55,7 +55,7 @@ LogLevel info TypesConfig /etc/mime.types AddDefaultCharset UTF-8 CoreDumpDirectory /tmp -Alias /docs /usr/local/lib/python3.10/anitya/static/docs/html/ +Alias /docs /usr/local/lib/python3.10/site-packages/anitya/static/docs/html/ Alias /static /usr/local/lib/python3.10/site-packages/anitya/static/ WSGIDaemonProcess anitya display-name=anitya processes=2 threads=2 maximum-requests=1000 home=/httpdir WSGIApplicationGroup %{GLOBAL}