Add option to use strings when configuring logrotate (#673)

Resolves #672

Author: alessfg

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.24.3 (Unreleased)
+
+ENHANCEMENTS:
+
+- Allow strings in addition to a list when configuring `logrotate`.
+
 ## 0.24.2 (October 3rd, 2023)
 
 FEATURES:

defaults/main/logrotate.yml

@@ -2,14 +2,14 @@
 # Create custom logrotate config
 nginx_logrotate_conf_enable: false
 nginx_logrotate_conf:
-  paths:
-    - /var/log/nginx/*.log
-  options:
+  paths: /var/log/nginx/*.log # String or list of strings
+    # - /var/log/nginx/*.log
+  options: # daily # String or a list of strings
     - daily
     - missingok
     - rotate 14
     - compress
     - delaycompress
     - notifempty
-    - create 0644 www-data adm # Changes nginx logs permissions
+    - create 0644 www-data adm # Changes NGINX log permissions
     - sharedscripts

molecule/default/converge.yml

@@ -16,8 +16,7 @@
         nginx_service_timeout: 95
         nginx_logrotate_conf_enable: true
         nginx_logrotate_conf:
-          paths:
-            - /var/log/nginx/*.log
+          paths: /var/log/nginx/*.log
           options:
             - daily
             - missingok

templates/logrotate/nginx.j2

@@ -1,10 +1,18 @@
-{% for path in nginx_logrotate_conf.paths %}
+{% if nginx_logrotate_conf['paths'] is defined and nginx_logrotate_conf['paths'] is not mapping %}
+{% for path in nginx_logrotate_conf['paths'] if nginx_logrotate_conf['paths'] is not string %}
 {{ path }}
+{% else %}
+{{ nginx_logrotate_conf['paths'] }}
 {% endfor %}
+{%- endif %}
 {
-{% for option in nginx_logrotate_conf.options %}
+{% if nginx_logrotate_conf['options'] is defined and nginx_logrotate_conf['options'] is not mapping %}
+{% for option in nginx_logrotate_conf['options'] if nginx_logrotate_conf['options'] is not string %}
     {{ option }}
+{% else %}
+    {{ nginx_logrotate_conf['options'] }}
 {% endfor %}
+{%- endif %}
     postrotate
 {% if ansible_facts['os_family'] == "Debian" %}
         if [ -f /var/run/nginx.pid ]; then