Update OS support

ekohl · ekohl · commit dea27d53dc1c · 2019-07-28T17:02:23.000+02:00
Adds Debian 9 (Stretch), Debian 10 (Buster) and Fedora 30. Drops Debian
8 (Jessie) and Ubuntu 14.04.

Debian 8 is in LTS, but Debian backports doesn't support LTS
repositories. When Buster came out, the Jessie backports repository was
dropped. It can still install using VCS, but that's not supported by
this module and up to the user. Ubuntu 14.04 is EOL.
diff --git a/.sync.yml b/.sync.yml
@@ -2,7 +2,9 @@
 .travis.yml:
   docker_sets:
     - set: centos7-64
-    - set: ubuntu1404-64
+    - set: debian9-64
+    - set: fedora29-64
+    - set: fedora30-64
     - set: ubuntu1604-64
     - set: ubuntu1804-64
   secure: "n/CVUS2upgv5DifCm/YsjBxR/11bdTRDYi1x9QK6ILa32+6ngVV2RQaIMXXJfJKYIPT8/O21tpc9C7fOBRGhRpNbl0usfvqsZS0C9UkpEx6AqT7lcRzj6pLrNn3IuChhZ0tQjNiKp9LxVTzltxr5uTFwKKCE4o534v/DLAzkzq5EAZuBWpRS1rcVHQA3o0767Gu3601yyYkZj9ySDH5RpbSdTCcNkTzwtFhr2NEvVb+2FI0RhchDSqPBfNWHV4Hn3dKuL42MNC2zjd2FYFpC8F27OXk/erUZIOZFfpZuIWypjSimfVC95a2Nb8kfQotTvQxUI1fwiB01ibUQGGkJj+mh7Utg/byBrbijpJnWRR7TT6oQ1NbIUHVXcqE1tfpbCBZ4Ws2Hqji0QoGc0fMrkt1NVlZlgbVrb9t+ctb1QcLaEPI+1Zf2a3AZhXOKA1EGx2W5DTQSWSPv57BUtFPICZENQi/ats30h+0FwtN7rjfx8Q6BIGO2D5JODI6eJC0nLNaL5UaPA0pjGRsNlZWoUzieuKG08G/rQtj/8jLq/3eLICv1cbfvj7lDPc0thPwXdrPIC9nLSisb/wdLufpqXsFku9TeBqrRHfQWImybcv7JRAeZZeHEo+tvFvZg5MSAEiPmz8zIOJOKhuMKEXlOmALmSjEhW6Ca5r7xuQ5Qwm0="
diff --git a/.travis.yml b/.travis.yml
@@ -33,11 +33,27 @@ matrix:
     services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64 BEAKER_HYPERVISOR=docker CHECK=beaker
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64 BEAKER_HYPERVISOR=docker CHECK=beaker
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
+    services: docker
+  - rvm: 2.5.3
+    bundler_args: --without development release
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=fedora29-64 BEAKER_HYPERVISOR=docker CHECK=beaker
+    services: docker
+  - rvm: 2.5.3
+    bundler_args: --without development release
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=fedora29-64 BEAKER_HYPERVISOR=docker CHECK=beaker
+    services: docker
+  - rvm: 2.5.3
+    bundler_args: --without development release
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=fedora30-64 BEAKER_HYPERVISOR=docker CHECK=beaker
+    services: docker
+  - rvm: 2.5.3
+    bundler_args: --without development release
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=fedora30-64 BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
diff --git a/README.md b/README.md
@@ -24,21 +24,6 @@ The module can integrate with [stahnma/epel](https://forge.puppetlabs.com/stahnm
 to set up the repo by setting the `configure_epel` parameter to `true` (the default for RedHat) and
 installing the module.
 
-On Debian Jessie the module assumes the package certbot is available. This
-package can be found in jessie-backports. When using
-[puppetlabs/apt](https://forge.puppet.com/puppetlabs/apt) the following code
-can be used:
-
-```puppet
-include apt
-include apt::backports
-apt::pin { 'jessie-backports-letsencrypt':
-  release  => 'jessie-backports',
-  packages => prefix(['acme', 'cryptography', 'openssl', 'psutil', 'setuptools', 'pyasn1', 'pkg-resources'], 'python-'),
-  priority => 700,
-}
-```
-
 ## Usage
 
 ### Setting up the Let's Encrypt client
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -1,3 +1,5 @@
+# @summary Default parameters
+# @api private
 class letsencrypt::params {
   $agree_tos           = true
   $unsafe_registration = false
@@ -14,22 +16,12 @@
     'server' => 'https://acme-v01.api.letsencrypt.org/directory',
   }
 
-  if $facts['operatingsystem'] == 'Debian' and versioncmp($facts['operatingsystemrelease'], '8') >= 0 {
+  if $facts['osfamily'] == 'Debian' {
     $install_method = 'package'
     $package_name = 'certbot'
     $package_command = 'certbot'
     $config_dir = '/etc/letsencrypt'
-  } elsif $facts['operatingsystem'] == 'Ubuntu' and versioncmp($facts['operatingsystemrelease'], '16.04') == 0 {
-    $install_method = 'package'
-    $package_name = 'letsencrypt'
-    $package_command = 'letsencrypt'
-    $config_dir = '/etc/letsencrypt'
-  } elsif $facts['operatingsystem'] == 'Ubuntu' and versioncmp($facts['operatingsystemrelease'], '18.04') >= 0 {
-    $install_method = 'package'
-    $package_name = 'certbot'
-    $package_command = 'certbot'
-    $config_dir = '/etc/letsencrypt'
-  } elsif $facts['osfamily'] == 'RedHat' and versioncmp($facts['operatingsystemmajrelease'], '7') >= 0 {
+  } elsif $facts['osfamily'] == 'RedHat' {
     $install_method = 'package'
     $package_name = 'certbot'
     $package_command = 'certbot'
@@ -58,11 +50,7 @@
 
   $config_file = "${config_dir}/cli.ini"
 
-  if $facts['osfamily'] == 'RedHat' {
-    $configure_epel = $facts['os']['name'] != 'Fedora'
-  } else {
-    $configure_epel = false
-  }
+  $configure_epel = $facts['osfamily'] == 'RedHat' and $facts['os']['name'] != 'Fedora'
 
   $cron_owner_group = $facts['osfamily'] ? {
     'OpenBSD' =>  'wheel',
diff --git a/metadata.json b/metadata.json
@@ -29,21 +29,22 @@
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [
-        "29"
+        "29",
+        "30"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "14.04",
         "16.04",
         "18.04"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "8"
+        "9",
+        "10"
       ]
     },
     {
diff --git a/spec/classes/letsencrypt_spec.rb b/spec/classes/letsencrypt_spec.rb
@@ -64,23 +64,17 @@
             end
 
             if facts[:osfamily] == 'RedHat'
-              if facts[:operatingsystem] == 'Fedora'
-                is_expected.not_to contain_class('epel')
-              else
+              if epel
                 is_expected.to contain_class('epel').that_comes_before('Package[letsencrypt]')
+              else
+                is_expected.not_to contain_class('epel')
               end
-              is_expected.to contain_class('letsencrypt::install').with(install_method: 'package')
+              is_expected.to contain_class('letsencrypt::install').with(install_method: 'package').with(package_name: 'certbot')
               is_expected.to contain_class('letsencrypt').with(package_command: 'certbot')
               is_expected.to contain_package('letsencrypt').with(name: 'certbot')
               is_expected.to contain_file('/etc/letsencrypt').with(ensure: 'directory')
-            elsif facts[:operatingsystem] == 'Debian'
-              is_expected.to contain_class('letsencrypt::install').with(install_method: 'package')
-              is_expected.to contain_file('/etc/letsencrypt').with(ensure: 'directory')
-            elsif facts[:operatingsystem] == 'Ubuntu' && facts[:operatingsystemmajrelease] == '14.04'
-              is_expected.to contain_class('letsencrypt::install').with(install_method: 'vcs')
-              is_expected.to contain_file('/etc/letsencrypt').with(ensure: 'directory')
-            elsif facts[:operatingsystem] == 'Ubuntu'
-              is_expected.to contain_class('letsencrypt::install').with(install_method: 'package')
+            elsif facts[:osfamily] == 'Debian'
+              is_expected.to contain_class('letsencrypt::install').with(install_method: 'package').with(package_name: 'certbot')
               is_expected.to contain_file('/etc/letsencrypt').with(ensure: 'directory')
             elsif facts[:operatingsystem] == 'Gentoo'
               is_expected.to contain_class('letsencrypt::install').with(install_method: 'package').with(package_name: 'app-crypt/certbot')
diff --git a/spec/defines/letsencrypt_certonly_spec.rb b/spec/defines/letsencrypt_certonly_spec.rb
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb

Original file line number	Diff line number	Diff line change
`@@ -29,21 +29,22 @@`
`29`	`29`	`{`
`30`	`30`	`"operatingsystem": "Fedora",`
`31`	`31`	`"operatingsystemrelease": [`
`32`		`- "29"`
	`32`	`+ "29",`
	`33`	`+ "30"`
`33`	`34`	`]`
`34`	`35`	`},`
`35`	`36`	`{`
`36`	`37`	`"operatingsystem": "Ubuntu",`
`37`	`38`	`"operatingsystemrelease": [`
`38`		`- "14.04",`
`39`	`39`	`"16.04",`
`40`	`40`	`"18.04"`
`41`	`41`	`]`
`42`	`42`	`},`
`43`	`43`	`{`
`44`	`44`	`"operatingsystem": "Debian",`
`45`	`45`	`"operatingsystemrelease": [`
`46`		`- "8"`
	`46`	`+ "9",`
	`47`	`+ "10"`
`47`	`48`	`]`
`48`	`49`	`},`
`49`	`50`	`{`