2 files changed, 33 insertions, 17 deletions
diff --git a/modules/cron/manifests/init.pp b/modules/cron/manifests/init.pp
index b1fd335..cbbcc91 100644
--- a/modules/cron/manifests/init.pp
+++ b/modules/cron/manifests/init.pp
@@ -1,30 +1,27 @@
 class cron {
-  $from = "${facts['networking']['hostname']}-cron"
-  $password = secret::value('cron_email_password')
+  file {
+    '/etc/cronjobs':
+      ensure => directory,
+      recurse => true,
+      purge => true;
+  }
 
   package { ["cronie", "msmtp"]:
-    ensure => installed,
+    ensure => absent;
   }
 
   file {
     '/etc/msmtprc':
-      content => template('cron/msmtprc');
+      ensure => absent;
     '/etc/aliases':
-      content => template('cron/aliases');
-    "/etc/cronjobs":
-      ensure => directory,
-      recurse => true,
-      purge => true;
+      ensure => absent;
   }
 
   systemd::override { "cronie":
-    source => 'puppet:///modules/cron/override.conf';
+    ensure => absent;
   }
 
   service { 'cronie':
-    ensure => running,
-    enable => true,
-    subscribe => Systemd::Override['cronie'],
-    require => Package['cronie'];
+    ensure => absent;
   }
 }
diff --git a/modules/cron/manifests/job.pp b/modules/cron/manifests/job.pp
index 67e7412..5471547 100644
--- a/modules/cron/manifests/job.pp
+++ b/modules/cron/manifests/job.pp
@@ -1,6 +1,7 @@
 define cron::job($frequency, $source = undef, $content = undef, $ensure = undef) {
   require cron
   require godwrap
+  require systemd
 
   $godwrap_directory = $godwrap::directory;
 
@@ -11,10 +12,28 @@ define cron::job($frequency, $source = undef, $content = undef, $ensure = undef)
       content => $content,
       mode => '0755',
       require => File["/etc/cronjobs"];
-    "/etc/cron.${frequency}/${name}":
+    "/etc/systemd/system/${name}.service":
+      ensure => $ensure,
+      content => template('cron/service'),
+      mode => '0755',
+      require => File["/etc/cronjobs/${name}"],
+      notify => Exec['/usr/bin/systemctl daemon-reload'];
+    "/etc/systemd/system/${name}.timer":
       ensure => $ensure,
-      content => template('cron/job'),
+      content => template('cron/timer'),
       mode => '0755',
-      require => File["/etc/cronjobs/${name}"];
+      require => File["/etc/cronjobs/${name}"],
+      notify => Exec['/usr/bin/systemctl daemon-reload'];
+    "/etc/cron.${frequency}/${name}":
+      ensure => absent;
+  }
+
+  service { "${name}.timer":
+    ensure => running,
+    enable => true,
+    require => [
+      File["/etc/systemd/system/${name}.service"],
+      File["/etc/systemd/system/${name}.timer"],
+    ];
   }
 }