Merge pull request #1385 from voxpupuli/ubuntu2

Drop Ubuntu 10/12/14 code
voxpupuli · Jan 23, 2021 · 7d3c23c · 7d3c23c
2 parents 9c468b3 + da2ab41
commit 7d3c23c
Showing 1 changed file with 10 additions and 18 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -106,19 +106,7 @@
       }
     }
     'Debian': {
-      if ($facts['os']['name'] == 'ubuntu' and $facts['os']['distro']['codename'] in ['bionic'])
-      or ($facts['os']['name'] == 'debian' and $facts['os']['release']['major'] in ['9', '10']) {
-        $_module_os_overrides = {
-          'manage_repo'             => true,
-          'daemon_user'             => 'www-data',
-          'log_user'                => 'root',
-          'log_group'               => 'adm',
-          'log_mode'                => '0755',
-          'run_dir'                 => '/run/nginx',
-          'passenger_package_name'  => 'libnginx-mod-http-passenger',
-          'include_modules_enabled' => true,
-        }
-      } elsif ($facts['os']['name'] == 'ubuntu' and $facts['os']['distro']['codename'] in ['lucid', 'precise', 'trusty', 'xenial']) {
+      if ($facts['os']['name'] == 'ubuntu' and $facts['os']['distro']['codename'] == 'xenial') {
         $_module_os_overrides = {
           'manage_repo' => true,
           'daemon_user' => 'www-data',
@@ -127,13 +115,17 @@
           'log_mode'    => '0755',
           'run_dir'     => '/run/nginx',
         }
+      # The following was designed/tested on Ubuntu 18 and Debian 9/10 but probably works on newer versions as well
       } else {
         $_module_os_overrides = {
-          'daemon_user' => 'www-data',
-          'log_user'    => 'root',
-          'log_group'   => 'adm',
-          'log_mode'    => '0755',
-          'run_dir'     => '/run/nginx',
+          'manage_repo'             => true,
+          'daemon_user'             => 'www-data',
+          'log_user'                => 'root',
+          'log_group'               => 'adm',
+          'log_mode'                => '0755',
+          'run_dir'                 => '/run/nginx',
+          'passenger_package_name'  => 'libnginx-mod-http-passenger',
+          'include_modules_enabled' => true,
         }
       }
     }