From da2ab41da01c63e46567f3c15b05cb0ba4991308 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 5 May 2020 13:04:51 +0200 Subject: [PATCH] Drop Ubuntu 10/12/14 code --- manifests/params.pp | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index c93164d06..169b27cab 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -109,19 +109,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', @@ -130,13 +118,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, } } }