diff --git a/roles/notifs/backend/tasks/main.yml b/roles/notifs/backend/tasks/main.yml index 94eac2104d..71218d0f88 100644 --- a/roles/notifs/backend/tasks/main.yml +++ b/roles/notifs/backend/tasks/main.yml @@ -55,7 +55,7 @@ - tasks.py - util.py when: - inventory_hostname.startswith('notifs-backend01.iad') + inventory_hostname.startswith('notifs-backend01.iad') or env != 'staging' tags: - notifs - notifs/backend diff --git a/roles/notifs/backend/templates/fmn.consumer.py b/roles/notifs/backend/templates/fmn.consumer.py index a5fe5da260..3a85b65b36 100644 --- a/roles/notifs/backend/templates/fmn.consumer.py +++ b/roles/notifs/backend/templates/fmn.consumer.py @@ -91,21 +91,20 @@ config = { # The notification backend uses this to build a fas cache of ircnicks # to fas usernames so it can act appropriately on certain message types. {% if env == 'staging' -%} - "fas_credentials": { - "username": "{{fedoraDummyUser}}", - "password": "{{fedoraDummyUserPassword}}", - "base_url": "https://accounts.stg.fedoraproject.org", + "fasjson": { + "active": True, + "url": "https://fasjson.stg.fedoraproject.org/" }, {% else -%} "fasjson": { "active": True, "url": "https://fasjson.fedoraproject.org/" }, + {% endif %} "fas_credentials": { "username": "{{fedoraDummyUser}}", "password": "{{fedoraDummyUserPassword}}", }, - {% endif %} ## Backend stuff ##