From 7a40481b1fe319206bb936176b0d7ceaabef8fc3 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Wed, 20 Jan 2021 11:39:49 +0100 Subject: [PATCH] Fix the datagrepper apache config and simplify the fedmsg config Signed-off-by: Pierre-Yves Chibon --- .../roles/datagrepper/templates/datagrepper-app.conf | 2 +- .../roles/datagrepper/templates/datagrepper-fedmsg.py | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ansible/roles/datagrepper/templates/datagrepper-app.conf b/ansible/roles/datagrepper/templates/datagrepper-app.conf index 4bc3782..f899c36 100644 --- a/ansible/roles/datagrepper/templates/datagrepper-app.conf +++ b/ansible/roles/datagrepper/templates/datagrepper-app.conf @@ -23,11 +23,11 @@ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/javascript text # Static resources for the datagrepper app. 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 WSGIRestrictStdout Off WSGIRestrictSignal Off 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 diff --git a/ansible/roles/datagrepper/templates/datagrepper-fedmsg.py b/ansible/roles/datagrepper/templates/datagrepper-fedmsg.py index ff3a45e..923eb87 100644 --- a/ansible/roles/datagrepper/templates/datagrepper-fedmsg.py +++ b/ansible/roles/datagrepper/templates/datagrepper-fedmsg.py @@ -8,15 +8,7 @@ config = { # 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 # other apps. - {% if env == "staging" %} - '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 %} + 'datanommer.sqlalchemy.url': 'postgresql://{{ datanommer_user }}:{{ datanommer_password }}@localhost/datanommer', # Only allow ajax/websockets connections back to our domains. # https://github.com/fedora-infra/datagrepper/pull/192