From 34641e12c061c0607e4cd6d8c3649456b0fb1d4e Mon Sep 17 00:00:00 2001 From: Jean Wasilewski Date: Wed, 24 Apr 2019 15:41:23 +0200 Subject: [PATCH 1/2] Fix ansible_managed headers to support multiline Signed-off-by: Jean Wasilewski --- templates/application.j2 | 2 +- templates/logrotate.conf.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/application.j2 b/templates/application.j2 index e723277..73ab028 100644 --- a/templates/application.j2 +++ b/templates/application.j2 @@ -1,4 +1,4 @@ -# {{ ansible_managed }} +{{ ansible_managed | comment }} {% for definition in item.definitions %} {{ definition.logs | join(" ") }} { diff --git a/templates/logrotate.conf.j2 b/templates/logrotate.conf.j2 index d827dc6..a42a2a6 100644 --- a/templates/logrotate.conf.j2 +++ b/templates/logrotate.conf.j2 @@ -1,4 +1,4 @@ -# {{ ansible_managed }} +{{ ansible_managed | comment }} # see "man logrotate" for details {% for option in logrotate_options %} From c378d2e755dac2320985ce5fa93213976ad226bf Mon Sep 17 00:00:00 2001 From: Simon Baerlocher Date: Thu, 25 Apr 2019 11:49:18 +0200 Subject: [PATCH 2/2] fix readme --- README.md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index ba404c7..d145154 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Ansible Role: logrotate -[![Build Status](https://img.shields.io/travis-ci/arillso/ansible.logrotate.svg?branch=master&style=popout-square)](https://travis-ci.org/arillso/ansible.logrotate) [![license](https://img.shields.io/github/license/mashape/apistatus.svg?style=popout-square)](https://sbaerlo.ch/licence) [![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-logrotate-blue.svg?style=popout-square)](https://galaxy.ansible.com/arillso/logrotate) [![Ansible Role](https://img.shields.io/ansible/role/d/23110.svg?style=popout-square)](https://galaxy.ansible.com/arillso/logrotate) +[![Build Status](https://img.shields.io/travis/arillso/ansible.logrotate.svg?branch=master&style=popout-square)](https://travis-ci.org/arillso/ansible.logrotate) [![license](https://img.shields.io/github/license/mashape/apistatus.svg?style=popout-square)](https://sbaerlo.ch/licence) [![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-logrotate-blue.svg?style=popout-square)](https://galaxy.ansible.com/arillso/logrotate) [![Ansible Role](https://img.shields.io/ansible/role/d/23110.svg?style=popout-square)](https://galaxy.ansible.com/arillso/logrotate) ## Description @@ -18,8 +18,8 @@ None ## Role Variables -| Variable | Default | Comments (type) | -| :--- | :--- | :--- | +| Variable | Default | Comments (type) | +| :--------------------- | :-------------------------------------------------------------------------------------------------- | :--------------------------------------- | | logrotate_options | [ 'weekly', 'su root syslog', 'rotate 4', 'create' ] | List of default options | | logrotate_wtmp | { logs: ['/var/log/wtmp'], options: ['missingok', 'monthly', 'create 0664 root utmp', 'rotate 1'] } | Logrotate options for wtmp | | logrotate_btmp | { logs: ['/var/log/btmp'], options: ['missingok', 'monthly', 'create 0660 root utmp', 'rotate 1'] } | Logrotate options for btmp | @@ -34,8 +34,9 @@ None ```yml - hosts: all roles: - - arillso.logrotate + - arillso.logrotate ``` + ### Example ```yml @@ -70,32 +71,32 @@ logrotate_applications: ### 1.4.1 -* add Red Hat Support +- add Red Hat Support ### 1.4 -* update loop_vars -* add defaults vars +- update loop_vars +- add defaults vars ### 1.3 -* new role tests +- new role tests ### 1.2 -* rename role +- rename role ### 1.1 -* add become support +- add become support ### 1.0 -* inital role +- inital role ## Author -* [Simon Bärlocher](https://sbaerlocher.ch) +- [Simon Bärlocher](https://sbaerlocher.ch) ## License