From 6c2a23d44fa68141e7f2f15dd23d3146ce6a065e Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Fri, 24 May 2019 00:09:30 +0000 Subject: [PATCH] resultsdb-backend: undoing a url change for taskotron instance Turns out that there are firewall changes needed for the Taskotron instance of resultsdb to use the new rabbitmq uri. Undoing that update until that change can be done --- .../buildmaster/files/allow-home-pid-files.te | 11 +++++++++++ .../resultsdb-backend/templates/config.toml.j2 | 4 ++++ 2 files changed, 15 insertions(+) create mode 100644 roles/taskotron/buildmaster/files/allow-home-pid-files.te diff --git a/roles/taskotron/buildmaster/files/allow-home-pid-files.te b/roles/taskotron/buildmaster/files/allow-home-pid-files.te new file mode 100644 index 0000000000..d6629a66b6 --- /dev/null +++ b/roles/taskotron/buildmaster/files/allow-home-pid-files.te @@ -0,0 +1,11 @@ + +module allow-home-pid-files 1.0; + +require { + type user_home_t; + type init_t; + class file { open read unlink }; +} + +#============= init_t ============== +allow init_t user_home_t:file { open read unlink }; diff --git a/roles/taskotron/resultsdb-backend/templates/config.toml.j2 b/roles/taskotron/resultsdb-backend/templates/config.toml.j2 index 6e794c1c88..178a39afe4 100644 --- a/roles/taskotron/resultsdb-backend/templates/config.toml.j2 +++ b/roles/taskotron/resultsdb-backend/templates/config.toml.j2 @@ -1,7 +1,11 @@ # Configuration for fedora-messaging. This file is in the TOML format. # For complete details on all configuration options, see the documentation. +{% if ansible_hostname == "resultsdb01.qa.fedoraproject.org" %} +amqp_url = "amqps://resultsdb{{ env_suffix }}:@rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org/%2Fpubsub" +{% else %} amqp_url = "amqps://resultsdb{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub" +{% endif %} {% if env == "staging" %} topic_prefix = "org.fedoraproject.stg"