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

Fix log names on kojipkgs by making it a template

Browse source 
Signed-off-by: Ricky Elrod <codeblock@fedoraproject.org>
This commit is contained in:
Rick Elrod 2017-08-25 22:42:33 +00:00
parent 3f16125440
commit 6747973914
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
roles/kojipkgs/tasks/main.yml
View file

@ -6,13 +6,21 @@
- name: install apache config files for local apache - name: install apache config files for local apache
copy: src={{ item }} dest=/etc/httpd/conf.d/{{ item }} owner=root group=root mode=644 copy: src={{ item }} dest=/etc/httpd/conf.d/{{ item }} owner=root group=root mode=644
with_items: with_items:
- kojipkgs.conf
- infrastructure.conf - infrastructure.conf
notify: notify:
- reload httpd - reload httpd
tags: tags:
- kojipkgs - kojipkgs
- name: install apache config templates for local apache
template: src={{ item }} dest=/etc/httpd/conf.d/{{ item }} owner=root group=root mode=644
with_items:
- kojipkgs.conf
notify:
- reload httpd
tags:
- kojipkgs
- name: make sure httpd listens on port 8080 - name: make sure httpd listens on port 8080
lineinfile: dest=/etc/httpd/conf/httpd.conf state=present regexp="^Listen 80" line="Listen 8080" lineinfile: dest=/etc/httpd/conf/httpd.conf state=present regexp="^Listen 80" line="Listen 8080"
notify: notify:

4
roles/kojipkgs/files/kojipkgs.conf → roles/kojipkgs/templates/kojipkgs.conf
View file

@ -4,8 +4,8 @@ ServerLimit 512
RequestHeader unset Accept-Encoding early RequestHeader unset Accept-Encoding early
CustomLog "| /usr/sbin/rotatelogs /var/log/httpd/kojipkgs01.fedoraproject.org-access.log.%Y-%m-%d 86400" combined CustomLog "| /usr/sbin/rotatelogs /var/log/httpd/{{inventory_hostname}}-access.log.%Y-%m-%d 86400" combined
ErrorLog "| /usr/sbin/rotatelogs /var/log/httpd/kojipkgs01.fedoraproject.org-error.log.%Y-%m-%d 86400" ErrorLog "| /usr/sbin/rotatelogs /var/log/httpd/{{inventory_hostname}}-error.log.%Y-%m-%d 86400"
Alias /atomic /mnt/fedora_koji/koji/atomic Alias /atomic /mnt/fedora_koji/koji/atomic