diff options
| author | Ricky Elrod <codeblock@fedoraproject.org> | 2017-08-25 22:42:33 +0000 |
|---|---|---|
| committer | Ricky Elrod <codeblock@fedoraproject.org> | 2017-08-25 22:42:33 +0000 |
| commit | 67479739140852e886d62880dfad97c6849036d2 (patch) | |
| tree | a35c4597c03d6684a99bfaef8015be8d8908a2c2 | |
| parent | 3f16125440e8f4aabc6f925a4f7b808e1d9b21a4 (diff) | |
| download | ansible-67479739140852e886d62880dfad97c6849036d2.tar.gz ansible-67479739140852e886d62880dfad97c6849036d2.tar.xz ansible-67479739140852e886d62880dfad97c6849036d2.zip | |
Fix log names on kojipkgs by making it a template
Signed-off-by: Ricky Elrod <codeblock@fedoraproject.org>
| -rw-r--r-- | roles/kojipkgs/tasks/main.yml | 10 | ||||
| -rw-r--r-- | roles/kojipkgs/templates/kojipkgs.conf (renamed from roles/kojipkgs/files/kojipkgs.conf) | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/roles/kojipkgs/tasks/main.yml b/roles/kojipkgs/tasks/main.yml index 57b96a44f..1afcb5a98 100644 --- a/roles/kojipkgs/tasks/main.yml +++ b/roles/kojipkgs/tasks/main.yml @@ -6,13 +6,21 @@ - name: install apache config files for local apache copy: src={{ item }} dest=/etc/httpd/conf.d/{{ item }} owner=root group=root mode=644 with_items: - - kojipkgs.conf - infrastructure.conf notify: - reload httpd tags: - 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 lineinfile: dest=/etc/httpd/conf/httpd.conf state=present regexp="^Listen 80" line="Listen 8080" notify: diff --git a/roles/kojipkgs/files/kojipkgs.conf b/roles/kojipkgs/templates/kojipkgs.conf index 588f6b1f7..434d9adf8 100644 --- a/roles/kojipkgs/files/kojipkgs.conf +++ b/roles/kojipkgs/templates/kojipkgs.conf @@ -4,8 +4,8 @@ ServerLimit 512 RequestHeader unset Accept-Encoding early -CustomLog "| /usr/sbin/rotatelogs /var/log/httpd/kojipkgs01.fedoraproject.org-access.log.%Y-%m-%d 86400" combined -ErrorLog "| /usr/sbin/rotatelogs /var/log/httpd/kojipkgs01.fedoraproject.org-error.log.%Y-%m-%d 86400" +CustomLog "| /usr/sbin/rotatelogs /var/log/httpd/{{inventory_hostname}}-access.log.%Y-%m-%d 86400" combined +ErrorLog "| /usr/sbin/rotatelogs /var/log/httpd/{{inventory_hostname}}-error.log.%Y-%m-%d 86400" Alias /atomic /mnt/fedora_koji/koji/atomic |