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

[release-monitoring] Prepare for 2.0.0 release

Browse source 
Update deployment and configuration for Anitya 2.0.0 release.

Signed-off-by: Michal Konecny <mkonecny@redhat.com>
This commit is contained in:
Michal Konecny 2025-01-10 10:44:08 +01:00
parent a063e8c205
commit 416ce48c32
2 changed files with 45 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

53
roles/openshift-apps/release-monitoring/templates/anitya.toml
View file

@ -22,11 +22,10 @@ db_url = "postgresql://{{ anitya_db_user }}:{{ anitya_db_pass }}@{{ anitya_db_ho
# List of admins
anitya_web_admins = [
{% if env == 'staging' %}
"7d183b09-d0d7-49e6-8ff3-fc2cce312cc0", # zlopez stg
"zlopez@fedoraproject.org", # zlopez stg
{% else %}
"5dd1b1f2-fee1-44f0-abeb-29df5bf151c7", # zlopez
"5a11f015-54ee-4319-9092-39c427873575", # tibbs
"42abdf74-b50e-49b4-a674-7cf01868d609", # kevin
"zlopez@fedoraproject.org", # zlopez
"kevin@fedoraproject.org", # kevin
{% endif %}
]
@ -87,10 +86,48 @@ google_server_metadata_url = "https://accounts.google.com/.well-known/openid-con
# Additional arguments for Google authentication
google_client_kwargs = { scope = "openid profile email" }
{% else %}
social_auth_authentication_backends = [
'social_core.backends.fedora.FedoraOpenId',
'social_core.backends.open_id.OpenIdAuth',
]
# Enabled authentication backends
authlib_enabled_backends = ["Fedora", "GitHub", "Google"]
# Github OAuth backend variables
# Github OAuth app client id
# See https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/creating-an-oauth-app
github_client_id = "{{ anitya_github_client_id }}"
# Github OAuth app client secret
# See https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/creating-an-oauth-app
github_client_secret = "{{ anitya_github_client_secret }}"
# Github access token URL
github_access_token_url = "https://github.com/login/oauth/access_token"
# Github URL used for authorization
github_authorize_url = "https://github.com/login/oauth/authorize"
# Github URL for API
github_api_base_url = "https://api.github.com/"
# Additional arguments for Github authentication
github_client_kwargs = { scope = "user" }
# Fedora OAuth backend variables
# Fedora OAuth client id
# Have to be requested in a ticket on https://pagure.io/fedora-infrastructure
fedora_client_id = "{{ anitya_fedora_client_id }}"
# Fedora OAuth secret
# Have to be requested in a ticket on https://pagure.io/fedora-infrastructure
fedora_client_secret = "{{ anitya_fedora_client_secret }}"
# Fedora OAuth authentication endpoint
fedora_server_metadata_url = "https://id.fedoraproject.org/.well-known/openid-configuration"
# Additional arguments for Fedora authentication
fedora_client_kwargs = { scope = "openid profile email", token_endpoint_auth_method = "client_secret_post" }
# Google OAuth backend variables
# Google OAuth client id
# See https://support.google.com/cloud/answer/6158849
google_client_id = "{{ anitya_google_client_id }}"
# Google OAuth client secret
# See https://support.google.com/cloud/answer/6158849
google_client_secret = "{{ anitya_google_client_secret }}"
# Google OAuth authentication endpoint
google_server_metadata_url = "https://accounts.google.com/.well-known/openid-configuration"
# Additional arguments for Google authentication
google_client_kwargs = { scope = "openid profile email" }
{% endif %}
# Default regular expression used for backend

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

@ -74,11 +74,6 @@ items:
pip-3 install dist/*.whl && \
popd && \
rm -rf anitya
{% if env == 'production' %}
# Hotfix for social_auth-sqlalchemy
# Could be removed when we switch to something else
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