Merge pull request #180 from syseleven/feature/support1804

Add support for 18.04
voxpupuli · Jan 24, 2019 · 8d8e7ea · 8d8e7ea
2 parents 8dc8f83 + f06d329
commit 8d8e7ea
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -353,7 +353,7 @@ The puppetlabs repositories can be found at:
 <http://yum.puppetlabs.com/> and <http://apt.puppetlabs.com/>
 
 * RedHat / CentOS 5/6/7
-* Ubuntu 12.04 / 14.04 / 16.04
+* Ubuntu 12.04 / 14.04 / 16.04 / 18.04
 * Debian 7
 
 Operating Systems without an Augueas version >= 1 such as Ubuntu 12.04 must use

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -23,19 +23,16 @@
     /Debian/: {
       case $facts['os']['name'] {
         /Ubuntu/: {
-          case $facts['os']['release']['major'] {
-            /^16.04$/: {
-              $service_file_location   = '/etc/systemd/system/confluence.service'
-              $service_file_template   = 'confluence/confluence.service.erb'
-              $service_lockfile        = '/var/lock/subsys/confluence'
-              $refresh_systemd         = true
-            }
-            default: {
-              $service_file_location   = '/etc/init.d/confluence'
-              $service_file_template   = 'confluence/confluence.initscript.erb'
-              $service_lockfile        = '/var/lock/confluence'
-              $refresh_systemd         = false
-            }
+          if $facts['service_provider'] == 'systemd' {
+            $service_file_location   = '/etc/systemd/system/confluence.service'
+            $service_file_template   = 'confluence/confluence.service.erb'
+            $service_lockfile        = '/var/lock/subsys/confluence'
+            $refresh_systemd         = true
+          } else {
+            $service_file_location   = '/etc/init.d/confluence'
+            $service_file_template   = 'confluence/confluence.initscript.erb'
+            $service_lockfile        = '/var/lock/confluence'
+            $refresh_systemd         = false
           }
         }
         default: {

diff --git a/metadata.json b/metadata.json
@@ -50,7 +50,9 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "14.04"
+        "14.04",
+        "16.04",
+        "18.04"
       ]
     }
   ]