Working product.

2 files changed, 30 insertions, 12 deletions

diff --git a/manifests/renew/systemd.pp b/manifests/renew/systemd.pp
index 8c63f23..f64e7e5 100644
--- a/manifests/renew/systemd.pp
+++ b/manifests/renew/systemd.pp
@@ -1,16 +1,11 @@
-# Handles renewal certificates through systemd timers
-# @param service_name Target name of the service file
-# @param service_path Where the service file should be installed
 # @api private
-class letsencrypt::renew::systemd (
-  String $service_name = 'letsencrypt-renew',
-  String $service_path = '/etc/systemd/system',
+define letsencrypt::renew::systemd (
+  String $cert_name = $name
 ) {
-  file { "${service_path}/${service_name}@.service":
-    source => "puppet:///modules/${module_name}/letsencrypt-renew.service",
-  }
-
-  file { "${service_path}/${service_name}@.timer":
-    source => "puppet:///modules/${module_name}/letsencrypt-renew.timer",
+  require letsencrypt::renew::systemd::setup
+  $service = $letsencrypt::renew::systemd::setup::service_name
+  service { "${service}@${cert_name}.timer":
+    ensure => 'running',
+    enable => true,
   }
 }
diff --git a/manifests/renew/systemd/setup.pp b/manifests/renew/systemd/setup.pp
new file mode 100644
index 0000000..5839efc
--- /dev/null
+++ b/manifests/renew/systemd/setup.pp
@@ -0,0 +1,23 @@
+# Handles renewal certificates through systemd timers
+# @param service_name Target name of the service file
+# @param service_path Where the service file should be installed
+# @api private
+class letsencrypt::renew::systemd::setup (
+  String $service_name = 'letsencrypt-renew',
+  String $service_path = '/etc/systemd/system',
+) {
+  file { "${service_path}/${service_name}@.service":
+    source => "puppet:///modules/${module_name}/letsencrypt-renew.service",
+    notify => Exec['systemctl daemon-reload'],
+  }
+
+  file { "${service_path}/${service_name}@.timer":
+    source => "puppet:///modules/${module_name}/letsencrypt-renew.timer",
+    notify => Exec['systemctl daemon-reload'],
+  }
+
+  exec { 'systemctl daemon-reload':
+    refreshonly => true,
+    provider    => shell,
+  }
+}