Infrastructure/arc
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Fix the datagrepper apache config and simplify the fedmsg config

Browse source 
Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
This commit is contained in:
Pierre-Yves Chibon 2021-01-20 11:39:49 +01:00
parent 74f79ee76e
commit 7a40481b1f
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ansible/roles/datagrepper/templates/datagrepper-app.conf
View file

@ -23,11 +23,11 @@ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/javascript text
# Static resources for the datagrepper app. # Static resources for the datagrepper app.
Alias /datagrepper/static/ /usr/lib/python2.7/site-packages/datagrepper/static/ Alias /datagrepper/static/ /usr/lib/python2.7/site-packages/datagrepper/static/
WSGIDaemonProcess datagrepper user=fedmsg group=fedmsg maximum-requests=50000 display-name=datagrepper processes=20 threads=5 inactivity-timeout=900
WSGISocketPrefix run/wsgi WSGISocketPrefix run/wsgi
WSGIRestrictStdout Off WSGIRestrictStdout Off
WSGIRestrictSignal Off WSGIRestrictSignal Off
WSGIPythonOptimize 1 WSGIPythonOptimize 1
WSGIDaemonProcess datagrepper user=fedmsg group=fedmsg maximum-requests=50000 display-name=datagrepper processes=20 threads=5 inactivity-timeout=900
WSGIScriptAlias /datagrepper /usr/share/datagrepper/apache/datagrepper.wsgi WSGIScriptAlias /datagrepper /usr/share/datagrepper/apache/datagrepper.wsgi

10
ansible/roles/datagrepper/templates/datagrepper-fedmsg.py
View file

@ -8,15 +8,7 @@ config = {
# expect the amount of data it generates to grow pretty steadily over time # expect the amount of data it generates to grow pretty steadily over time
# and we don't want *read* operations on that database to slow down all our # and we don't want *read* operations on that database to slow down all our
# other apps. # other apps.
{% if env == "staging" %} 'datanommer.sqlalchemy.url': 'postgresql://{{ datanommer_user }}:{{ datanommer_password }}@localhost/datanommer',
'datanommer.sqlalchemy.url': 'postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer01.stg.iad2.fedoraproject.org/datanommer',
'fedmenu_url': 'https://apps.stg.fedoraproject.org/fedmenu',
'fedmenu_data_url': 'https://apps.stg.fedoraproject.org/js/data.js',
{% else %}
'datanommer.sqlalchemy.url': 'postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer01.iad2.fedoraproject.org/datanommer',
'fedmenu_url': 'https://apps.fedoraproject.org/fedmenu',
'fedmenu_data_url': 'https://apps.fedoraproject.org/js/data.js',
{% endif %}
# Only allow ajax/websockets connections back to our domains. # Only allow ajax/websockets connections back to our domains.
# https://github.com/fedora-infra/datagrepper/pull/192 # https://github.com/fedora-infra/datagrepper/pull/192