From 876b2bf821d47469dce3d4b92ad2c19563fd55f3 Mon Sep 17 00:00:00 2001
From: Bram Vogelaar <bram@attachmentgenie.com>
Date: Sat, 23 Jan 2021 22:54:21 +0100
Subject: [PATCH] adding focal support

---
 manifests/params.pp           | 2 +-
 metadata.json                 | 3 ++-
 spec/acceptance/class_spec.rb | 2 +-
 spec/classes/nginx_spec.rb    | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 03ee57583..1bfec883f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -115,7 +115,7 @@
           '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
+        # The following was designed/tested on Ubuntu 18 and Debian 9/10 but probably works on newer versions as well
       } else {
         $_module_os_overrides = {
           'manage_repo'             => true,
diff --git a/metadata.json b/metadata.json
index 9c4a4a8ed..0fb9dd038 100644
--- a/metadata.json
+++ b/metadata.json
@@ -78,7 +78,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "16.04",
-        "18.04"
+        "18.04",
+        "20.04"
       ]
     }
   ]
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index dcce17af7..353c766ce 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -17,7 +17,7 @@
     pkg_match = case fact('operatingsystemmajrelease')
                 when '9', '10'
                   %r{Debian Nginx Maintainers}
-                when '18.04'
+                when '18.04', '20.04'
                   %r{Ubuntu Developers}
                 else
                   %r{Phusion}
diff --git a/spec/classes/nginx_spec.rb b/spec/classes/nginx_spec.rb
index 2b86c9c0b..20877b18b 100644
--- a/spec/classes/nginx_spec.rb
+++ b/spec/classes/nginx_spec.rb
@@ -177,7 +177,7 @@
 
             it { is_expected.to contain_package('nginx') }
             if facts[:lsbdistid] == 'Debian' && %w[9 10].include?(facts.dig(:os, 'release', 'major')) ||
-               facts[:lsbdistid] == 'Ubuntu' && %w[bionic].include?(facts[:lsbdistcodename])
+               facts[:lsbdistid] == 'Ubuntu' && %w[bionic focal].include?(facts[:lsbdistcodename])
               it { is_expected.to contain_package('libnginx-mod-http-passenger') }
             else
               it { is_expected.to contain_package('passenger') }