factor out defining a systemd service

6 files changed, 36 insertions, 24 deletions

diff --git a/modules/bitwarden/manifests/server.pp b/modules/bitwarden/manifests/server.pp
index 58b4865..808ffe1 100644
--- a/modules/bitwarden/manifests/server.pp
+++ b/modules/bitwarden/manifests/server.pp
@@ -11,18 +11,20 @@ class bitwarden::server($data_dir) {
     require => Service["docker"];
   }
 
-  file {
-    $data_dir:
-      ensure => directory;
-    "/etc/systemd/system/bitwarden.service":
-      content => template("bitwarden/bitwarden.service"),
-      notify => Exec["/usr/bin/systemctl daemon-reload"];
+  file { $data_dir:
+    ensure => directory;
+  }
+
+  systemd::service { "bitwarden":
+    content => template("bitwarden/bitwarden.service"),
   }
 
   service { "bitwarden":
     ensure => running,
     enable => true,
-    require => Exec["docker pull bitwardenrs/server:latest"],
-    subscribe => File["/etc/systemd/system/bitwarden.service"];
+    require => [
+      Exec["docker pull bitwardenrs/server:latest"],
+      Systemd::Service["bitwarden"],
+    ]
   }
 }
diff --git a/modules/mail/manifests/mailu.pp b/modules/mail/manifests/mailu.pp
index 9297dd6..169b9d9 100644
--- a/modules/mail/manifests/mailu.pp
+++ b/modules/mail/manifests/mailu.pp
@@ -100,9 +100,8 @@ class mail::mailu {
     require => Service["mailu"];
   }
 
-  file { "/etc/systemd/system/mailu.service":
+  systemd::service { "mailu":
     source => "puppet:///modules/mail/mailu.service",
-    notify => Exec["/usr/bin/systemctl daemon-reload"];
   }
 
   service { "mailu":
@@ -111,7 +110,7 @@ class mail::mailu {
     subscribe => [
       File["/media/persistent/docker-compose.yml"],
       Exec["create env file"],
-      File["/etc/systemd/system/mailu.service"],
+      Systemd::Service["mailu"],
     ];
   }
 }
diff --git a/modules/metabase/manifests/init.pp b/modules/metabase/manifests/init.pp
index 2f79ec1..d2e5db5 100644
--- a/modules/metabase/manifests/init.pp
+++ b/modules/metabase/manifests/init.pp
@@ -32,12 +32,10 @@ class metabase {
         User['metabase'],
         Group['metabase'],
       ];
-    "/usr/lib/systemd/system/metabase.service":
-      source => "puppet:///modules/metabase/metabase.service",
-      notify => [
-        Exec["/usr/bin/systemctl daemon-reload"],
-        Service["metabase"],
-      ];
+  }
+
+  systemd::service { "metabase":
+    source => "puppet:///modules/metabase/metabase.service",
   }
 
   exec { "download metabase":
@@ -76,7 +74,7 @@ class metabase {
     enable => true,
     require => [
       Package["jre11-openjdk-headless"],
-      File["/usr/lib/systemd/system/metabase.service"],
+      Systemd::Service["metabase"],
       File["/media/persistent/metabase"],
       Exec["download metabase"],
       Exec["create metabase db user"],
diff --git a/modules/systemd/manifests/override.pp b/modules/systemd/manifests/override.pp
index 976dc08..c605382 100644
--- a/modules/systemd/manifests/override.pp
+++ b/modules/systemd/manifests/override.pp
@@ -7,7 +7,10 @@ define systemd::override($source = undef, $content = undef) {
     "/etc/systemd/system/${name}.service.d/override.conf":
       source => $source,
       content => $content,
-      notify => Exec['/usr/bin/systemctl daemon-reload'],
+      notify => [
+        Exec['/usr/bin/systemctl daemon-reload'],
+        Service["${name}"]
+      ],
       require => File["/etc/systemd/system/${name}.service.d"];
   }
 }
diff --git a/modules/systemd/manifests/service.pp b/modules/systemd/manifests/service.pp
new file mode 100644
index 0000000..87a1dc9
--- /dev/null
+++ b/modules/systemd/manifests/service.pp
@@ -0,0 +1,12 @@
+define systemd::service($source = undef, $content = undef) {
+  include systemd
+
+  file { "/usr/lib/systemd/system/${name}.service":
+    source => $source,
+    content => $content,
+    notify => [
+      Exec["/usr/bin/systemctl daemon-reload"],
+      Service["${name}"],
+    ];
+  }
+}
diff --git a/modules/teleterm/manifests/init.pp b/modules/teleterm/manifests/init.pp
index 68fc5de..79303ee 100644
--- a/modules/teleterm/manifests/init.pp
+++ b/modules/teleterm/manifests/init.pp
@@ -18,17 +18,15 @@ class teleterm($source) {
     notify => Service["teleterm"];
   }
 
-  file {
-    "/etc/systemd/system/teleterm.service":
-      source => "puppet:///modules/teleterm/teleterm.service",
-      notify => Exec["/usr/bin/systemctl daemon-reload"];
+  systemd::service { "teleterm":
+    source => "puppet:///modules/teleterm/teleterm.service",
   }
 
   service { "teleterm":
     ensure => "running",
     enable => true,
     require => [
-      File["/etc/systemd/system/teleterm.service"],
+      Systemd::Service["teleterm"],
       Exec["/usr/bin/systemctl daemon-reload"],
       User["teleterm"],
       Group["teleterm"],