diff --git a/inventory/group_vars/copr-back b/inventory/group_vars/copr-back index 9a98c79961..2ffc232eb4 100644 --- a/inventory/group_vars/copr-back +++ b/inventory/group_vars/copr-back @@ -27,7 +27,7 @@ frontend_base_url: "https://copr.fedorainfracloud.org" # See http://infrastructure.fedoraproject.org/csi/security-policy/ csi_security_category: High -csi_primary_contact: "msuchy (mirek, clime, asamalik, frostyx) IRC #fedora-admin, #fedora-buildsys" +csi_primary_contact: "msuchy (mirek), clime, frostyx, dturecek IRC #fedora-admin, #fedora-buildsys" csi_purpose: Provide the backend for copr (3rd party packages) csi_relationship: | - Backend: Management of copr cloud infrastructure (OpenStack). diff --git a/inventory/group_vars/copr-back-stg b/inventory/group_vars/copr-back-stg index be77649b9e..e8946170e9 100644 --- a/inventory/group_vars/copr-back-stg +++ b/inventory/group_vars/copr-back-stg @@ -24,6 +24,6 @@ frontend_base_url: "http://copr-fe-dev.cloud.fedoraproject.org" # See http://infrastructure.fedoraproject.org/csi/security-policy/ csi_security_category: Moderate -csi_primary_contact: "msuchy (mirek, clime, frostyx, asamalik) IRC #fedora-admin, #fedora-buildsys" +csi_primary_contact: "msuchy (mirek), clime, frostyx, dturecek IRC #fedora-admin, #fedora-buildsys" csi_purpose: Provide the testing environment of copr's backend csi_relationship: This host is the testing environment for the cloud infrastructure of copr's backend diff --git a/inventory/group_vars/copr-front b/inventory/group_vars/copr-front index 123a1d954e..d49a97457d 100644 --- a/inventory/group_vars/copr-front +++ b/inventory/group_vars/copr-front @@ -7,7 +7,7 @@ copr_frontend_public_hostname: "copr.fedorainfracloud.org" # See http://infrastructure.fedoraproject.org/csi/security-policy/ csi_security_category: Moderate -csi_primary_contact: "msuchy (mirek, clime, asamalik, frostyx) IRC #fedora-admin, #fedora-buildsys" +csi_primary_contact: "msuchy (mirek), clime, frostyx, dturecek IRC #fedora-admin, #fedora-buildsys" csi_purpose: Provide a publicly accessible frontend for 3rd party packages (copr) csi_relationship: | - This host provides the frontend part of copr only. diff --git a/inventory/group_vars/copr-front-stg b/inventory/group_vars/copr-front-stg index e957b17a34..27a5e4194b 100644 --- a/inventory/group_vars/copr-front-stg +++ b/inventory/group_vars/copr-front-stg @@ -2,7 +2,7 @@ copr_frontend_public_hostname: "copr-fe-dev.cloud.fedoraproject.org" csi_security_category: Low -csi_primary_contact: "msuchy (mirek), clime | IRC #fedora-admin, #fedora-buildsys" +csi_primary_contact: "msuchy (mirek), clime, frostyx, dturecek IRC #fedora-admin, #fedora-buildsys" csi_purpose: Provide the testing environment of copr's frontend csi_relationship: This host is the testing environment for copr's web interface diff --git a/roles/abrt/faf/templates/etc-faf-faf.conf.j2 b/roles/abrt/faf/templates/etc-faf-faf.conf.j2 index 18c8a19dda..9dc8cfd8eb 100644 --- a/roles/abrt/faf/templates/etc-faf-faf.conf.j2 +++ b/roles/abrt/faf/templates/etc-faf-faf.conf.j2 @@ -20,7 +20,7 @@ Server = {{ smtp_server }} Port = {{ smtp_port }} Username = {{ smtp_username|default("", true) }} Password = {{ smtp_password|default("", true) }} - +From = {{ faf_admin_mail }} [uReport] # The directory that holds 'reports' and 'attachments' subdirectories Directory = {{ faf_spool_dir }}