Skip to content

Commit

Permalink
Merge pull request arillso#9 from arillso/develop
Browse files Browse the repository at this point in the history
Fix ansible_managed headers to support multiline
  • Loading branch information
sbaerlocher authored Apr 25, 2019
2 parents 0aced5b + c378d2e commit 3a47e26
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
25 changes: 13 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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 |
Expand All @@ -34,8 +34,9 @@ None
```yml
- hosts: all
roles:
- arillso.logrotate
- arillso.logrotate
```
### Example
```yml
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion templates/application.j2
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# {{ ansible_managed }}
{{ ansible_managed | comment }}

{% for definition in item.definitions %}
{{ definition.logs | join(" ") }} {
Expand Down
2 changes: 1 addition & 1 deletion templates/logrotate.conf.j2
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# {{ ansible_managed }}
{{ ansible_managed | comment }}

# see "man logrotate" for details
{% for option in logrotate_options %}
Expand Down

0 comments on commit 3a47e26

Please sign in to comment.