diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml index 19a8e00e8e..6df3990f8f 100644 --- a/playbooks/groups/batcave.yml +++ b/playbooks/groups/batcave.yml @@ -31,7 +31,7 @@ SSLCertificateChainFile: "{{wildcard_int_file}}" - role: rabbit/user username: "batcave{{ env_suffix }}" - sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(ansible|git|infragit|logger\.log)\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(ansible|git|infragit|logger)\..* - role: rabbit/queue username: "mirror_pagure_ansible{{ env_suffix }}" queue_name: "mirror_pagure_ansible{{ env_suffix }}" diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index ce4b8a03e1..84834ae23b 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -104,7 +104,7 @@ # Set up for fedora-messaging - role: rabbit/user username: "mirrormanager{{ env_suffix }}" - sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(mirrormanager|logger\.log)\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(mirrormanager|logger)\..* handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index 3a1279940e..b0cba1ef5e 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -38,7 +38,7 @@ # Set up for fedora-messaging - role: rabbit/user username: "notifs-backend{{ env_suffix }}" - sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(fmn|logger\.log)\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(fmn|logger)\..* - sudo tasks: diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index d0aa20dea4..14e97c09ce 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -29,7 +29,7 @@ # Set up for fedora-messaging - role: rabbit/user username: "notifs-web{{ env_suffix }}" - sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(fmn|logger\.log)\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(fmn|logger)\..* - notifs/frontend - sudo diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml index 0c60499eb6..5a5cb54bb9 100644 --- a/playbooks/groups/pdc.yml +++ b/playbooks/groups/pdc.yml @@ -47,6 +47,6 @@ # Set up for fedora-messaging - role: rabbit/user username: "pdc{{ env_suffix }}" - sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(pdc|logger\.log)\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(pdc|logger)\..* when: inventory_hostname.startswith(('pdc-web01','pdc-web01.stg')) - pdc/frontend diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml index 300b8610e9..b84c2411e4 100644 --- a/playbooks/groups/people.yml +++ b/playbooks/groups/people.yml @@ -75,7 +75,7 @@ - git/server - role: rabbit/user username: "planet{{ env_suffix }}" - sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(planet|logger\.log)\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(planet|logger)\..* - role: apache diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index 7f00b4b6ae..d8071fe020 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -82,7 +82,7 @@ # Set up for fedora-messaging - role: rabbit/user username: "pagure{{ env_suffix }}" - sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(pagure|git|logger\.log)\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(pagure|git|logger)\..* handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 9f650eb4af..ed9aea3df1 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -130,7 +130,7 @@ - role: rabbit/user username: "pungi{{ env_suffix }}" - sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(pungi|compose|logger\.log)\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(pungi|compose|logger)\..* - { role: "push-container-registry", diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index b6ea016323..371a1b8a69 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -33,7 +33,7 @@ - role: rabbit/queue username: "wiki{{ env_suffix }}" queue_name: "wiki{{ env_suffix }}" - sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(wiki|logger\.log)\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(wiki|logger)\..* when: inventory_hostname.startswith('wiki01') - { role: nfs/client, when: env == "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app_staging/app/attachments' } - { role: nfs/client, when: env != "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app/app/attachments' }