From 48c95f1d1596af965b364ea0d0cb80363190b6be Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 15 Feb 2017 21:36:52 +0000 Subject: [PATCH 1/3] Use correct mbs krb principals. --- roles/mbs/common/templates/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/mbs/common/templates/config.py b/roles/mbs/common/templates/config.py index fb6bb81082..edb5023536 100644 --- a/roles/mbs/common/templates/config.py +++ b/roles/mbs/common/templates/config.py @@ -87,9 +87,9 @@ class ProdConfiguration(BaseConfiguration): {% endif %} {% if env == 'staging' %} - KRB_PRINCIPAL = 'modularity@STG.FEDORAPROJECT.ORG' + KRB_PRINCIPAL = 'mbs/mbs.stg.fedoraproject.org@STG.FEDORAPROJECT.ORG' {% else %} - KRB_PRINCIPAL = 'modularity@FEDORAPROJECT.ORG' + KRB_PRINCIPAL = 'mbs/mbs.fedoraproject.org@FEDORAPROJECT.ORG' {% endif %} KRB_KEYTAB = '/etc/krb5.mbs_mbs{{env_suffix}}.fedoraproject.org.keytab' From c19d85e314e59168e189fb8b7223022abbea72f2 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 15 Feb 2017 22:02:39 +0000 Subject: [PATCH 2/3] add ostree to bodhi2/backend role Signed-off-by: Adam Miller --- roles/bodhi2/backend/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index 2060d413ce..ea4f95484b 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -25,6 +25,7 @@ - python-alembic - python-scandir - python2-productmd + - ostree tags: - packages - bodhi From 0f6fcd4599054e7a08a9df5bce4cb174866b589f Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Wed, 15 Feb 2017 23:14:59 +0000 Subject: [PATCH 3/3] put in a picture of a whale and a flowerpot. --- roles/web-data-analysis/files/summary.html | 3 ++- roles/web-data-analysis/tasks/main.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/web-data-analysis/files/summary.html b/roles/web-data-analysis/files/summary.html index 009b65f9c7..f09221603e 100644 --- a/roles/web-data-analysis/files/summary.html +++ b/roles/web-data-analysis/files/summary.html @@ -6,6 +6,7 @@ + @@ -29,4 +30,4 @@ - \ No newline at end of file + diff --git a/roles/web-data-analysis/tasks/main.yml b/roles/web-data-analysis/tasks/main.yml index 8afb91f780..d686cd241e 100644 --- a/roles/web-data-analysis/tasks/main.yml +++ b/roles/web-data-analysis/tasks/main.yml @@ -63,7 +63,7 @@ - name: daily cron file to run the log files copy: src={{item}} dest=/etc/cron.d/ mode=0644 - with_items: [condense-mirrorlogs.cron, condense-getfedoralogs.cron, run-daily-awstats.cron] + with_items: [condense-mirrorlogs.cron, condense-getfedoralogs.cron, run-daily-awstats.cron, condense-hotspot.cron] tags: - web-data - cron