From ee7708ed35a3a086334374bc95d538d427455945 Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lars@linux-schulserver.de>
Date: Feb 04 2020 11:37:43 +0000
Subject: Merge branch 'cboltz-cron-everywhere' into 'production'


Install and enable cron everywhere

See merge request infra/salt!332
---

diff --git a/salt/profile/countdown/countdown.sls b/salt/profile/countdown/countdown.sls
index aa59f01..46df7cc 100644
--- a/salt/profile/countdown/countdown.sls
+++ b/salt/profile/countdown/countdown.sls
@@ -26,10 +26,6 @@ countdown:
     - contents:
       - '0 * * * *     countdown   /srv/www/countdown.opensuse.org/svg/cron.sh -G -E && rsync -a --delete-after /srv/www/countdown.opensuse.org/output/ /srv/www/countdown.opensuse.org/public/'
 
-cron:
-  service.running:
-    - enable: True
-
 countdown_git:
   git.latest:
     - name: https://github.com/openSUSE/countdown.o.o.git
diff --git a/salt/profile/cron/init.sls b/salt/profile/cron/init.sls
new file mode 100644
index 0000000..9218923
--- /dev/null
+++ b/salt/profile/cron/init.sls
@@ -0,0 +1,4 @@
+cron:
+  pkg.installed: []
+  service.running:
+    - enable: True
diff --git a/salt/role/base.sls b/salt/role/base.sls
index 8d9cd90..c9a713a 100644
--- a/salt/role/base.sls
+++ b/salt/role/base.sls
@@ -1,6 +1,7 @@
 include:
   - profile.accounts
   - profile.apparmor
+  - profile.cron
   - profile.ldap.client
   - profile.log
   - profile.monitoring