Merge pull request arillso#18 from ganto/feature/logrotate_options

Fix custom definition of logrotate_options via inventory
weekendesk · Jan 16, 2020 · ae9119c · ae9119c
2 parents 9d64511 + 010e6a5
commit ae9119c
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 and [human-readable changelog](https://keepachangelog.com/en/1.0.0/).
 
+## Master
+
+### Fixed
+
+- Fix custom definition of logrotate_options via inventory
+
 ## 1.5.1
 
 ### Fixed

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,6 +1,10 @@
 ---
 # defaults file for arillso.logrotate
 
+# List of global options. If this is empty the default options of the
+# distribution are used.
+logrotate_options: []
+
 # Path to the imclude files
 logrotate_include_dir: /etc/logrotate.d
 

diff --git a/templates/etc/logrotate.conf.j2 b/templates/etc/logrotate.conf.j2
@@ -1,9 +1,15 @@
 {{ ansible_managed | comment }}
 
 # see "man logrotate" for details
+{% if logrotate_options | length > 0 %}
 {% for option in logrotate_options %}
 {{ option }}
 {% endfor %}
+{% else %}
+{% for option in logrotate_distribution_options | default([]) %}
+{{ option }}
+{% endfor %}
+{% endif %}
 
 # packages drop log rotation information into this directory
 include {{ logrotate_include_dir }}

diff --git a/vars/CentOS.yml b/vars/CentOS.yml
@@ -2,7 +2,7 @@
 # vars file for arillso.logrotate
 
 # List of global options for the different systems.
-logrotate_options:
+logrotate_distribution_options:
   - weekly
   - rotate 4
   - create

diff --git a/vars/Debian.yml b/vars/Debian.yml
@@ -2,7 +2,7 @@
 # vars file for arillso.logrotate
 
 # List of global options for the different systems.
-logrotate_options:
+logrotate_distribution_options:
   - weekly
   - rotate 4
   - create

diff --git a/vars/RedHat.yml b/vars/RedHat.yml
@@ -2,7 +2,7 @@
 # vars file for arillso.logrotate
 
 # List of global options for the different systems.
-logrotate_options:
+logrotate_distribution_options:
   - weekly
   - rotate 4
   - create

diff --git a/vars/Ubuntu.yml b/vars/Ubuntu.yml
@@ -2,7 +2,7 @@
 # vars file for arillso.logrotate
 
 # List of global options for the different systems.
-logrotate_options:
+logrotate_distribution_options:
   - weekly
   - rotate 4
   - create