From e904342ffbf135fbeeac83f904031cc8c09617a8 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Wed, 19 Jun 2019 12:06:23 +0200
Subject: [PATCH] fix cron setup

---
 defaults/main.yml                           | 10 +++++++---
 molecule/ec2-centos-7/playbook.yml          |  3 ++-
 molecule/ec2-centos-7/tests/test_default.py |  7 ++++++-
 tasks/yum_cron.yml                          |  3 +++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 6fa7235..6345420 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,11 +1,15 @@
 ---
-yum_cron_enabled:
+yum_cron_enabled: True
+
+yum_cron_custom_cronjob:
   enabled: False
   name: yum-cron
   minute: 0
   hour: 4
-  
-yum_cron_custom_cronjob: False
+  day: "*"
+  weekday: "*"
+  month: "*"
+
 yum_cron_apply_updates: no
 yum_cron_download_updates: yes
 yum_cron_email_from: root@localhost
diff --git a/molecule/ec2-centos-7/playbook.yml b/molecule/ec2-centos-7/playbook.yml
index 73cb4e6..7e15c0f 100644
--- a/molecule/ec2-centos-7/playbook.yml
+++ b/molecule/ec2-centos-7/playbook.yml
@@ -2,7 +2,8 @@
 - name: Converge
   hosts: all
   vars:
-    yum_cron_enabled:
+    yum_cron_enabled: True
+    yum_cron_custom_cronjob:
       enabled: True
 
   roles:
diff --git a/molecule/ec2-centos-7/tests/test_default.py b/molecule/ec2-centos-7/tests/test_default.py
index e80834a..93a378d 100644
--- a/molecule/ec2-centos-7/tests/test_default.py
+++ b/molecule/ec2-centos-7/tests/test_default.py
@@ -14,7 +14,12 @@ def test_yum_cron_is_installed(host):
     assert yum.is_installed
 
 
-def test_yum_running_and_enabled(host):
+def test_yum_cron_running_and_enabled(host):
     yum = host.service("yum-cron")
     assert yum.is_running
     assert yum.is_enabled
+
+
+def test_yum_cron_custom_cronjob(host):
+    custom = host.file("/etc/cron.d/x-yum")
+    assert custom.exists
diff --git a/tasks/yum_cron.yml b/tasks/yum_cron.yml
index bc19002..41de95e 100644
--- a/tasks/yum_cron.yml
+++ b/tasks/yum_cron.yml
@@ -43,6 +43,9 @@
         name: "{{ yum_cron_custom_cronjob.name | default('yum-cron') }}"
         minute: "{{ yum_cron_custom_cronjob.minute | default(0) }}"
         hour: "{{ yum_cron_custom_cronjob.hour | default(4) }}"
+        day: "{{ yum_cron_custom_cronjob.day | default('*') }}"
+        weekday: "{{ yum_cron_custom_cronjob.weekday | default('*') }}"
+        month: "{{ yum_cron_custom_cronjob.month | default('*') }}"
         user: root
         cron_file: /etc/crontab
         job: "/bin/sh /etc/cron.d/x-yum"