From 7e7cef94ad87bfa65483eefa2064f2522c627a4e Mon Sep 17 00:00:00 2001 From: Stephen Coady Date: Tue, 23 Mar 2021 09:35:27 +0000 Subject: [PATCH] update config to use fasjson and give it the address Signed-off-by: Stephen Coady --- .../toddlers/templates/fedora-messaging.toml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/roles/openshift-apps/toddlers/templates/fedora-messaging.toml b/roles/openshift-apps/toddlers/templates/fedora-messaging.toml index 906c0d8102..efa779cb69 100644 --- a/roles/openshift-apps/toddlers/templates/fedora-messaging.toml +++ b/roles/openshift-apps/toddlers/templates/fedora-messaging.toml @@ -60,8 +60,11 @@ blocked_toddlers = ["debug"] mail_server = "bastion.fedoraproject.org" admin_email = "admin@fedoraproject.org" -# Account to use to connect to FAS -fas_url = "https://admin.fedoraproject.org/accounts" +# Use fasjson instead of FAS +fasjson = true + +# Account to use to connect to FAS/FASJSON +fas_url = "https://fasjson.fedoraproject.org/" fas_username = "{{ fedoraDummyUser }}" fas_password = "{{ fedoraDummyUserPassword }}" @@ -138,12 +141,6 @@ notify_admins = [ "kevin@fedoraproject.org", "pingou@fedoraproject.org", ] -# Use fasjson instead of FAS -{% if env == "staging" %} -fasjson = true -{% else %} -fasjson = false -{% endif %} # PDC types mapping for distgit_bugzilla_sync toddler [consumer_config.distgit_bugzilla_sync.pdc_types]