Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Rick Elrod 2017-02-15 23:34:04 +00:00
commit 029706cbbb
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
roles/bodhi2/backend/tasks/main.yml
View file

@ -25,6 +25,7 @@
- python-alembic
- python-scandir
- python2-productmd
- ostree
tags:
- packages
- bodhi

4
roles/mbs/common/templates/config.py
View file

@ -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'

3
roles/web-data-analysis/files/summary.html
View file

@ -6,6 +6,7 @@
<body>
<img src="fedora-os-latest-ma.png"/>
<img src="hotspot-all-ma.png"/>
<img src="fedora-os-latest.png"/>
<img src="fedora-os-latest-stacked-ma.png"/>
@ -29,4 +30,4 @@
<img src="epel-arch-ma.png"/>
</body>
</body>

2
roles/web-data-analysis/tasks/main.yml
View file

@ -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