Fix bug in service_autorestart::systemd preventing Debian (Ubuntu) ba…

…sed hosts from working correctly
EncoreTechnologies · May 26, 2020 · 3d4aec3 · 3d4aec3
1 parent 962af0d
commit 3d4aec3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## Release 0.1.2
+
+**Bugfixes**
+
+* Fixed `service_autorestart::systemd` from throwing and error on Ubuntu because it was using a different
+  path for `.service` files. We now use module-level hiera data to default these locations.
+
 ## Release 0.1.1
 
 **Bugfixes**

diff --git a/data/os/Debian.yaml b/data/os/Debian.yaml
@@ -0,0 +1,2 @@
+---
+service_autorestart::systemd_dir: /lib/systemd/system
diff --git a/data/os/RedHat.yaml b/data/os/RedHat.yaml
@@ -0,0 +1,2 @@
+---
+service_autorestart::systemd_dir: /usr/lib/systemd/system
diff --git a/manifests/systemd.pp b/manifests/systemd.pp
@@ -51,7 +51,8 @@
 #   }
 #
 define service_autorestart::systemd (
-  String $path  = "/usr/lib/systemd/system/${title}.service",
+  String $systemd_dir  = lookup('service_autorestart::systemd_dir') |$k| { '/usr/lib/systemd/system' },
+  String $path  = "${systemd_dir}/${title}.service",
   String $value = 'on-failure',
   Optional[String] $delay = undef,
   Boolean $autonotify_path = true,

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "encore-service_autorestart",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "author": "Encore Technologies",
   "summary": "Puppet module to manage auto-restarting services (Windows and SystemD), and Windows Service Recovery options",
   "license": "Apache-2.0",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		---
		service_autorestart::systemd_dir: /lib/systemd/system
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		---
		service_autorestart::systemd_dir: /usr/lib/systemd/system