diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06653b7..06ad6be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -132,6 +132,8 @@ rubocop: # git-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} # git-oraclelinux-8-tiamat-py3: {extends: '.test_instance'} # git-oraclelinux-7-tiamat-py3: {extends: '.test_instance'} +# git-almalinux-8-tiamat-py3: {extends: '.test_instance'} +# git-rockylinux-8-tiamat-py3: {extends: '.test_instance'} # git-debian-10-master-py3: {extends: '.test_instance'} deb-debian-10-master-py3: {extends: '.test_instance'} # git-debian-9-master-py3: {extends: '.test_instance'} @@ -146,6 +148,7 @@ rpm-centos-7-master-py3: {extends: '.test_instance'} rpm-fedora-34-master-py3: {extends: '.test_instance'} # git-fedora-33-master-py3: {extends: '.test_instance'} rpm-fedora-33-master-py3: {extends: '.test_instance'} +git-opensuse-leap-153-master-py3: {extends: '.test_instance'} git-opensuse-leap-152-master-py3: {extends: '.test_instance'} git-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} # git-amazonlinux-2-master-py3: {extends: '.test_instance'} @@ -157,20 +160,27 @@ rpm-oraclelinux-8-master-py3: {extends: '.test_instance'} git-arch-base-latest-master-py3: {extends: '.test_instance'} git-gentoo-stage3-latest-master-py3: {extends: '.test_instance'} git-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} -# git-debian-10-3003-0-py3: {extends: '.test_instance'} -# git-debian-9-3003-0-py3: {extends: '.test_instance'} -# git-ubuntu-2004-3003-0-py3: {extends: '.test_instance'} -# git-ubuntu-1804-3003-0-py3: {extends: '.test_instance'} -# git-centos-8-3003-0-py3: {extends: '.test_instance'} -# git-centos-7-3003-0-py3: {extends: '.test_instance'} -# git-fedora-34-3003-0-py3: {extends: '.test_instance'} -# git-fedora-33-3003-0-py3: {extends: '.test_instance'} -# git-amazonlinux-2-3003-0-py3: {extends: '.test_instance'} -# git-oraclelinux-8-3003-0-py3: {extends: '.test_instance'} -# git-oraclelinux-7-3003-0-py3: {extends: '.test_instance'} -# git-arch-base-latest-3003-0-py3: {extends: '.test_instance'} -# git-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'} -# git-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'} +# git-almalinux-8-master-py3: {extends: '.test_instance'} +rpm-almalinux-8-master-py3: {extends: '.test_instance'} +# git-rockylinux-8-master-py3: {extends: '.test_instance'} +rpm-rockylinux-8-master-py3: {extends: '.test_instance'} +# git-debian-10-3003-1-py3: {extends: '.test_instance'} +# git-debian-9-3003-1-py3: {extends: '.test_instance'} +# git-ubuntu-2004-3003-1-py3: {extends: '.test_instance'} +# git-ubuntu-1804-3003-1-py3: {extends: '.test_instance'} +# git-centos-8-3003-1-py3: {extends: '.test_instance'} +# git-centos-7-3003-1-py3: {extends: '.test_instance'} +# git-fedora-34-3003-1-py3: {extends: '.test_instance'} +# git-fedora-33-3003-1-py3: {extends: '.test_instance'} +# git-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'} +# git-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'} +# git-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'} +# git-amazonlinux-2-3003-1-py3: {extends: '.test_instance'} +# git-oraclelinux-8-3003-1-py3: {extends: '.test_instance'} +# git-oraclelinux-7-3003-1-py3: {extends: '.test_instance'} +# git-arch-base-latest-3003-1-py3: {extends: '.test_instance'} +# git-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'} +# git-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'} # git-debian-10-3002-6-py3: {extends: '.test_instance'} # git-debian-9-3002-6-py3: {extends: '.test_instance'} # git-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} @@ -183,8 +193,9 @@ git-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # git-oraclelinux-8-3002-6-py3: {extends: '.test_instance'} # git-oraclelinux-7-3002-6-py3: {extends: '.test_instance'} # git-arch-base-latest-3002-6-py3: {extends: '.test_instance'} -# git-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'} -# git-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'} +# git-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'} +# git-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'} +# git-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'} # git-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'} # git-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'} # git-debian-10-3001-7-py3: {extends: '.test_instance'} @@ -195,27 +206,29 @@ git-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # git-centos-7-3001-7-py3: {extends: '.test_instance'} # git-fedora-34-3001-7-py3: {extends: '.test_instance'} # git-fedora-33-3001-7-py3: {extends: '.test_instance'} +# git-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'} # git-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'} # git-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'} # git-amazonlinux-2-3001-7-py3: {extends: '.test_instance'} # git-oraclelinux-8-3001-7-py3: {extends: '.test_instance'} # git-oraclelinux-7-3001-7-py3: {extends: '.test_instance'} # git-arch-base-latest-3001-7-py3: {extends: '.test_instance'} -# git-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'} -# git-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'} +# git-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'} +# git-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'} # git-debian-10-3000-9-py3: {extends: '.test_instance'} # git-debian-9-3000-9-py3: {extends: '.test_instance'} # git-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} # git-centos-8-3000-9-py3: {extends: '.test_instance'} # git-centos-7-3000-9-py3: {extends: '.test_instance'} +# git-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'} # git-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'} # git-amazonlinux-2-3000-9-py3: {extends: '.test_instance'} # git-oraclelinux-8-3000-9-py3: {extends: '.test_instance'} # git-oraclelinux-7-3000-9-py3: {extends: '.test_instance'} +# git-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'} +# git-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'} # git-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} # git-arch-base-latest-3000-9-py2: {extends: '.test_instance'} -# git-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'} -# git-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9bc4109..41b5f35 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -52,3 +52,14 @@ repos: - id: rstcheck name: Check reST files using rstcheck exclude: 'docs/CHANGELOG.rst' + - repo: https://github.com/saltstack-formulas/mirrors-rst-lint + rev: v1.3.2 + hooks: + - id: rst-lint + name: Check reST files using rst-lint + exclude: | + (?x)^( + docs/CHANGELOG.rst| + docs/TOFS_pattern.rst| + )$ + additional_dependencies: [pygments==2.9.0] diff --git a/.travis.yml b/.travis.yml index ce85151..62dc1de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,6 +92,8 @@ jobs: # - env: INSTANCE=git-amazonlinux-2-tiamat-py3 # - env: INSTANCE=git-oraclelinux-8-tiamat-py3 # - env: INSTANCE=git-oraclelinux-7-tiamat-py3 + # - env: INSTANCE=git-almalinux-8-tiamat-py3 + # - env: INSTANCE=git-rockylinux-8-tiamat-py3 # - env: INSTANCE=git-debian-10-master-py3 - env: INSTANCE=deb-debian-10-master-py3 # - env: INSTANCE=git-debian-9-master-py3 @@ -106,6 +108,7 @@ jobs: - env: INSTANCE=rpm-fedora-34-master-py3 # - env: INSTANCE=git-fedora-33-master-py3 - env: INSTANCE=rpm-fedora-33-master-py3 + - env: INSTANCE=git-opensuse-leap-153-master-py3 - env: INSTANCE=git-opensuse-leap-152-master-py3 - env: INSTANCE=git-opensuse-tmbl-latest-master-py3 # - env: INSTANCE=git-amazonlinux-2-master-py3 @@ -117,20 +120,27 @@ jobs: - env: INSTANCE=git-arch-base-latest-master-py3 - env: INSTANCE=git-gentoo-stage3-latest-master-py3 - env: INSTANCE=git-gentoo-stage3-systemd-master-py3 - # - env: INSTANCE=git-debian-10-3003-0-py3 - # - env: INSTANCE=git-debian-9-3003-0-py3 - # - env: INSTANCE=git-ubuntu-2004-3003-0-py3 - # - env: INSTANCE=git-ubuntu-1804-3003-0-py3 - # - env: INSTANCE=git-centos-8-3003-0-py3 - # - env: INSTANCE=git-centos-7-3003-0-py3 - # - env: INSTANCE=git-fedora-34-3003-0-py3 - # - env: INSTANCE=git-fedora-33-3003-0-py3 - # - env: INSTANCE=git-amazonlinux-2-3003-0-py3 - # - env: INSTANCE=git-oraclelinux-8-3003-0-py3 - # - env: INSTANCE=git-oraclelinux-7-3003-0-py3 - # - env: INSTANCE=git-arch-base-latest-3003-0-py3 - # - env: INSTANCE=git-gentoo-stage3-latest-3003-0-py3 - # - env: INSTANCE=git-gentoo-stage3-systemd-3003-0-py3 + # - env: INSTANCE=git-almalinux-8-master-py3 + - env: INSTANCE=rpm-almalinux-8-master-py3 + # - env: INSTANCE=git-rockylinux-8-master-py3 + - env: INSTANCE=rpm-rockylinux-8-master-py3 + # - env: INSTANCE=git-debian-10-3003-1-py3 + # - env: INSTANCE=git-debian-9-3003-1-py3 + # - env: INSTANCE=git-ubuntu-2004-3003-1-py3 + # - env: INSTANCE=git-ubuntu-1804-3003-1-py3 + # - env: INSTANCE=git-centos-8-3003-1-py3 + # - env: INSTANCE=git-centos-7-3003-1-py3 + # - env: INSTANCE=git-fedora-34-3003-1-py3 + # - env: INSTANCE=git-fedora-33-3003-1-py3 + # - env: INSTANCE=git-opensuse-leap-153-3003-1-py3 + # - env: INSTANCE=git-opensuse-leap-152-3003-1-py3 + # - env: INSTANCE=git-opensuse-tmbl-latest-3003-1-py3 + # - env: INSTANCE=git-amazonlinux-2-3003-1-py3 + # - env: INSTANCE=git-oraclelinux-8-3003-1-py3 + # - env: INSTANCE=git-oraclelinux-7-3003-1-py3 + # - env: INSTANCE=git-arch-base-latest-3003-1-py3 + # - env: INSTANCE=git-gentoo-stage3-latest-3003-1-py3 + # - env: INSTANCE=git-gentoo-stage3-systemd-3003-1-py3 # - env: INSTANCE=git-debian-10-3002-6-py3 # - env: INSTANCE=git-debian-9-3002-6-py3 # - env: INSTANCE=git-ubuntu-2004-3002-6-py3 @@ -143,8 +153,9 @@ jobs: # - env: INSTANCE=git-oraclelinux-8-3002-6-py3 # - env: INSTANCE=git-oraclelinux-7-3002-6-py3 # - env: INSTANCE=git-arch-base-latest-3002-6-py3 - # - env: INSTANCE=git-gentoo-stage3-latest-3002-5-py3 - # - env: INSTANCE=git-gentoo-stage3-systemd-3002-5-py3 + # - env: INSTANCE=git-gentoo-stage3-latest-3002-6-py3 + # - env: INSTANCE=git-gentoo-stage3-systemd-3002-6-py3 + # - env: INSTANCE=git-opensuse-leap-153-3002-2-py3 # - env: INSTANCE=git-opensuse-leap-152-3002-2-py3 # - env: INSTANCE=git-opensuse-tmbl-latest-3002-2-py3 # - env: INSTANCE=git-debian-10-3001-7-py3 @@ -155,27 +166,29 @@ jobs: # - env: INSTANCE=git-centos-7-3001-7-py3 # - env: INSTANCE=git-fedora-34-3001-7-py3 # - env: INSTANCE=git-fedora-33-3001-7-py3 + # - env: INSTANCE=git-opensuse-leap-153-3001-7-py3 # - env: INSTANCE=git-opensuse-leap-152-3001-7-py3 # - env: INSTANCE=git-opensuse-tmbl-latest-3001-7-py3 # - env: INSTANCE=git-amazonlinux-2-3001-7-py3 # - env: INSTANCE=git-oraclelinux-8-3001-7-py3 # - env: INSTANCE=git-oraclelinux-7-3001-7-py3 # - env: INSTANCE=git-arch-base-latest-3001-7-py3 - # - env: INSTANCE=git-gentoo-stage3-latest-3001-6-py3 - # - env: INSTANCE=git-gentoo-stage3-systemd-3001-6-py3 + # - env: INSTANCE=git-gentoo-stage3-latest-3001-7-py3 + # - env: INSTANCE=git-gentoo-stage3-systemd-3001-7-py3 # - env: INSTANCE=git-debian-10-3000-9-py3 # - env: INSTANCE=git-debian-9-3000-9-py3 # - env: INSTANCE=git-ubuntu-1804-3000-9-py3 # - env: INSTANCE=git-centos-8-3000-9-py3 # - env: INSTANCE=git-centos-7-3000-9-py3 + # - env: INSTANCE=git-opensuse-leap-153-3000-9-py3 # - env: INSTANCE=git-opensuse-leap-152-3000-9-py3 # - env: INSTANCE=git-amazonlinux-2-3000-9-py3 # - env: INSTANCE=git-oraclelinux-8-3000-9-py3 # - env: INSTANCE=git-oraclelinux-7-3000-9-py3 + # - env: INSTANCE=git-gentoo-stage3-latest-3000-9-py3 + # - env: INSTANCE=git-gentoo-stage3-systemd-3000-9-py3 # - env: INSTANCE=git-ubuntu-1804-3000-9-py2 # - env: INSTANCE=git-arch-base-latest-3000-9-py2 - # - env: INSTANCE=git-gentoo-stage3-latest-3000-8-py3 - # - env: INSTANCE=git-gentoo-stage3-systemd-3000-8-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/AUTHORS.md b/AUTHORS.md index c425e29..03acebe 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,8 +4,8 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|68 -@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|26 +@myii|[@myii](https://github.com/myii)|70 +@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|30 @martinhoefling|[@martinhoefling](https://github.com/martinhoefling)|16 @fortunejuggle|[@fortunejuggle](https://github.com/fortunejuggle)|13 @aboe76|[@aboe76](https://github.com/aboe76)|11 @@ -41,4 +41,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-06-23. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-07-02. diff --git a/CHANGELOG.md b/CHANGELOG.md index dafe2f4..a25aa6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,28 @@ # Changelog +# [3.0.0](https://github.com/saltstack-formulas/letsencrypt-formula/compare/v2.1.1...v3.0.0) (2021-07-02) + + +### Bug Fixes + +* **defaults:** install `certbot` with no plugins ([70dafdd](https://github.com/saltstack-formulas/letsencrypt-formula/commit/70dafdd9456e27d224c94a2bcccc916fedd16bd4)) + + +### Continuous Integration + +* **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([f937dca](https://github.com/saltstack-formulas/letsencrypt-formula/commit/f937dca2ff16eff5fc4f855ae2d550ef15eefa34)) + + +### BREAKING CHANGES + +* **defaults:** The formula was installing the Apache plugin by default +which is not reasonable. Also, as `letsencrypt:pkgs` is a list, +_adding_ another entry in the list was not replacing this default, causing +undesired packages to be installed. + +The new default is an empty list of packages, defaulting to `certbot` in +the code. + ## [2.1.1](https://github.com/saltstack-formulas/letsencrypt-formula/compare/v2.1.0...v2.1.1) (2021-06-23) diff --git a/FORMULA b/FORMULA index 8cf4a8e..3d54829 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: letsencrypt os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS -version: 2.1.1 +version: 3.0.0 release: 1 minimum_version: 2017.7 summary: letsencrypt formula diff --git a/Gemfile.lock b/Gemfile.lock index d7cbc3b..6ad4ef9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37 + revision: 1f543f654da5c1774cb8737f6f07a01745520bb5 branch: ssf specs: kitchen-docker (2.10.0) diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 7613530..07e5e80 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,10 +15,10 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 68 + - 70 * - :raw-html-m2r:`@javierbertoli` - `@javierbertoli `_ - - 26 + - 30 * - :raw-html-m2r:`@martinhoefling` - `@martinhoefling `_ - 16 @@ -119,4 +119,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-06-23. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-07-02. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index ad4e01f..724c824 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,33 @@ Changelog ========= +`3.0.0 `_ (2021-07-02) +------------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **defaults:** install ``certbot`` with no plugins (\ `70dafdd `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **3003.1:** update inc. AlmaLinux, Rocky & ``rst-lint`` [skip ci] (\ `f937dca `_\ ) + +BREAKING CHANGES +^^^^^^^^^^^^^^^^ + + +* **defaults:** The formula was installing the Apache plugin by default + which is not reasonable. Also, as ``letsencrypt:pkgs`` is a list, + *adding* another entry in the list was not replacing this default, causing + undesired packages to be installed. + +The new default is an empty list of packages, defaulting to ``certbot`` in +the code. + `2.1.1 `_ (2021-06-23) ------------------------------------------------------------------------------------------------------------- diff --git a/docs/README.rst b/docs/README.rst index b1cb542..2d77291 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -65,7 +65,6 @@ If `use_package` is `False` it installs and configures the letsencrypt cli from ** WARNING ** If you set `use_package` to `True`, it will: -* Default to Python3's certbot package (where possible), with Apache as the default Webserver to manage. * Delete all certbot's crons if they exist from a previous git-based installation (as the package uses a systemd's timer unit to renew all the certs) * Delete git-based installation's scripts (usually installed under /usr/local/bin) if they still exist declared in diff --git a/kitchen.yml b/kitchen.yml index 7451efe..314a295 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -37,6 +37,12 @@ platforms: - name: oraclelinux-7-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:oraclelinux-7 + - name: almalinux-8-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:almalinux-8 + - name: rockylinux-8-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:rockylinux-8 ## SALT `master` - name: debian-10-master-py3 @@ -63,6 +69,14 @@ platforms: - name: fedora-33-master-py3 driver: image: saltimages/salt-master-py3:fedora-33 + - name: opensuse-leap-153-master-py3 + driver: + image: saltimages/salt-master-py3:opensuse-leap-15.3 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: opensuse-leap-152-master-py3 driver: image: saltimages/salt-master-py3:opensuse-leap-15.2 @@ -99,52 +113,82 @@ platforms: - name: gentoo-stage3-systemd-master-py3 driver: image: saltimages/salt-master-py3:gentoo-stage3-systemd + - name: almalinux-8-master-py3 + driver: + image: saltimages/salt-master-py3:almalinux-8 + - name: rockylinux-8-master-py3 + driver: + image: saltimages/salt-master-py3:rockylinux-8 - ## SALT `3003.0` - - name: debian-10-3003-0-py3 + ## SALT `3003.1` + - name: debian-10-3003-1-py3 + driver: + image: saltimages/salt-3003.1-py3:debian-10 + - name: debian-9-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:debian-10 - - name: debian-9-3003-0-py3 + image: saltimages/salt-3003.1-py3:debian-9 + - name: ubuntu-2004-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:debian-9 - - name: ubuntu-2004-3003-0-py3 + image: saltimages/salt-3003.1-py3:ubuntu-20.04 + - name: ubuntu-1804-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:ubuntu-20.04 - - name: ubuntu-1804-3003-0-py3 + image: saltimages/salt-3003.1-py3:ubuntu-18.04 + - name: centos-8-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:ubuntu-18.04 - - name: centos-8-3003-0-py3 + image: saltimages/salt-3003.1-py3:centos-8 + - name: centos-7-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:centos-8 - - name: centos-7-3003-0-py3 + image: saltimages/salt-3003.1-py3:centos-7 + - name: fedora-34-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:centos-7 - - name: fedora-34-3003-0-py3 + image: saltimages/salt-3003.1-py3:fedora-34 + - name: fedora-33-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:fedora-34 - - name: fedora-33-3003-0-py3 + image: saltimages/salt-3003.1-py3:fedora-33 + - name: opensuse-leap-153-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:fedora-33 - - name: amazonlinux-2-3003-0-py3 + image: saltimages/salt-3003.1-py3:opensuse-leap-15.3 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-leap-152-3003-1-py3 + driver: + image: saltimages/salt-3003.1-py3:opensuse-leap-15.2 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-tmbl-latest-3003-1-py3 + driver: + image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: amazonlinux-2-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:amazonlinux-2 - - name: oraclelinux-8-3003-0-py3 + image: saltimages/salt-3003.1-py3:amazonlinux-2 + - name: oraclelinux-8-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:oraclelinux-8 - - name: oraclelinux-7-3003-0-py3 + image: saltimages/salt-3003.1-py3:oraclelinux-8 + - name: oraclelinux-7-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:oraclelinux-7 - - name: arch-base-latest-3003-0-py3 + image: saltimages/salt-3003.1-py3:oraclelinux-7 + - name: arch-base-latest-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:arch-base-latest + image: saltimages/salt-3003.1-py3:arch-base-latest run_command: /usr/lib/systemd/systemd - - name: gentoo-stage3-latest-3003-0-py3 + - name: gentoo-stage3-latest-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:gentoo-stage3-latest + image: saltimages/salt-3003.1-py3:gentoo-stage3-latest run_command: /sbin/init - - name: gentoo-stage3-systemd-3003-0-py3 + - name: gentoo-stage3-systemd-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:gentoo-stage3-systemd + image: saltimages/salt-3003.1-py3:gentoo-stage3-systemd ## SALT `3002.6` - name: debian-10-3002-6-py3 @@ -184,17 +228,23 @@ platforms: driver: image: saltimages/salt-3002.6-py3:arch-base-latest run_command: /usr/lib/systemd/systemd - - ## SALT `3002.5` - - name: gentoo-stage3-latest-3002-5-py3 + - name: gentoo-stage3-latest-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:gentoo-stage3-latest + image: saltimages/salt-3002.6-py3:gentoo-stage3-latest run_command: /sbin/init - - name: gentoo-stage3-systemd-3002-5-py3 + - name: gentoo-stage3-systemd-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:gentoo-stage3-systemd + image: saltimages/salt-3002.6-py3:gentoo-stage3-systemd ## SALT `3002.2` + - name: opensuse-leap-153-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:opensuse-leap-15.3 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: opensuse-leap-152-3002-2-py3 driver: image: saltimages/salt-3002.2-py3:opensuse-leap-15.2 @@ -237,6 +287,14 @@ platforms: - name: fedora-33-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:fedora-33 + - name: opensuse-leap-153-3001-7-py3 + driver: + image: saltimages/salt-3001.7-py3:opensuse-leap-15.3 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: opensuse-leap-152-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:opensuse-leap-15.2 @@ -266,15 +324,13 @@ platforms: driver: image: saltimages/salt-3001.7-py3:arch-base-latest run_command: /usr/lib/systemd/systemd - - ## SALT `3001.6` - - name: gentoo-stage3-latest-3001-6-py3 + - name: gentoo-stage3-latest-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:gentoo-stage3-latest + image: saltimages/salt-3001.7-py3:gentoo-stage3-latest run_command: /sbin/init - - name: gentoo-stage3-systemd-3001-6-py3 + - name: gentoo-stage3-systemd-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd + image: saltimages/salt-3001.7-py3:gentoo-stage3-systemd ## SALT `3000.9` - name: debian-10-3000-9-py3 @@ -292,6 +348,14 @@ platforms: - name: centos-7-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:centos-7 + - name: opensuse-leap-153-3000-9-py3 + driver: + image: saltimages/salt-3000.9-py3:opensuse-leap-15.3 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: opensuse-leap-152-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:opensuse-leap-15.2 @@ -309,6 +373,13 @@ platforms: - name: oraclelinux-7-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:oraclelinux-7 + - name: gentoo-stage3-latest-3000-9-py3 + driver: + image: saltimages/salt-3000.9-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3000-9-py3 + driver: + image: saltimages/salt-3000.9-py3:gentoo-stage3-systemd - name: ubuntu-1804-3000-9-py2 driver: image: saltimages/salt-3000.9-py2:ubuntu-18.04 @@ -317,15 +388,6 @@ platforms: image: saltimages/salt-3000.9-py2:arch-base-latest run_command: /usr/lib/systemd/systemd - ## SALT `3000.8` - - name: gentoo-stage3-latest-3000-8-py3 - driver: - image: saltimages/salt-3000.8-py3:gentoo-stage3-latest - run_command: /sbin/init - - name: gentoo-stage3-systemd-3000-8-py3 - driver: - image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd - provisioner: name: salt_solo log_level: debug @@ -369,8 +431,8 @@ suites: - debian-9-tiamat-py3 - debian-10-master-py3 - debian-9-master-py3 - - debian-10-3003-0-py3 - - debian-9-3003-0-py3 + - debian-10-3003-1-py3 + - debian-9-3003-1-py3 - debian-10-3002-6-py3 - debian-9-3002-6-py3 - debian-10-3001-7-py3 @@ -410,6 +472,8 @@ suites: - amazonlinux-2-tiamat-py3 - oraclelinux-8-tiamat-py3 - oraclelinux-7-tiamat-py3 + - almalinux-8-tiamat-py3 + - rockylinux-8-tiamat-py3 - centos-8-master-py3 - centos-7-master-py3 - fedora-34-master-py3 @@ -417,13 +481,15 @@ suites: - amazonlinux-2-master-py3 - oraclelinux-8-master-py3 - oraclelinux-7-master-py3 - - centos-8-3003-0-py3 - - centos-7-3003-0-py3 - - fedora-34-3003-0-py3 - - fedora-33-3003-0-py3 - - amazonlinux-2-3003-0-py3 - - oraclelinux-8-3003-0-py3 - - oraclelinux-7-3003-0-py3 + - almalinux-8-master-py3 + - rockylinux-8-master-py3 + - centos-8-3003-1-py3 + - centos-7-3003-1-py3 + - fedora-34-3003-1-py3 + - fedora-33-3003-1-py3 + - amazonlinux-2-3003-1-py3 + - oraclelinux-8-3003-1-py3 + - oraclelinux-7-3003-1-py3 - centos-8-3002-6-py3 - centos-7-3002-6-py3 - fedora-34-3002-6-py3 diff --git a/letsencrypt/defaults.yaml b/letsencrypt/defaults.yaml index 8bb293b..a483736 100644 --- a/letsencrypt/defaults.yaml +++ b/letsencrypt/defaults.yaml @@ -3,12 +3,13 @@ --- letsencrypt: use_package: true + pkgs: [] git_pkg: git - pkgs: - - python3-certbot-apache service: certbot.timer # Only used for the pkg install method (use_package: true), internal var _cli_path: /usr/bin/certbot + # Only used for the pkg install method (use_package: true), internal var + _default_pkg: certbot # Only used for the git install method (use_package: false) cli_install_dir: /opt/letsencrypt # Only used for the git install method (use_package: false). If you want to diff --git a/letsencrypt/install.sls b/letsencrypt/install.sls index aaeb4d6..bacad1b 100644 --- a/letsencrypt/install.sls +++ b/letsencrypt/install.sls @@ -21,8 +21,9 @@ letsencrypt_external_repo: letsencrypt-client: {%- if letsencrypt.use_package %} + {%- set pkgs = letsencrypt.pkgs or [letsencrypt._default_pkg] %} pkg.installed: - - pkgs: {{ letsencrypt.pkgs | json }} + - pkgs: {{ pkgs | json }} {%- else %} pkg.installed: - name: {{ letsencrypt.git_pkg }} diff --git a/letsencrypt/osfingermap.yaml b/letsencrypt/osfingermap.yaml index 335865a..b8b7017 100644 --- a/letsencrypt/osfingermap.yaml +++ b/letsencrypt/osfingermap.yaml @@ -10,11 +10,4 @@ # you will need to provide at least an empty dict in this file, e.g. # osfingermap: {} --- -# os: CentOS -CentOS Linux-7: - pkgs: - - python2-certbot-apache -# os: OEL -Oracle Linux Server-7: - pkgs: - - python2-certbot-apache +osfingermap: {} diff --git a/letsencrypt/osmap.yaml b/letsencrypt/osmap.yaml index dedbc74..2ec94b4 100644 --- a/letsencrypt/osmap.yaml +++ b/letsencrypt/osmap.yaml @@ -10,7 +10,4 @@ # you will need to provide at least an empty dict in this file, e.g. # osmap: {} --- -# os_family: RedHat -Amazon: - pkgs: - - python2-certbot-apache +osmap: {} diff --git a/pillar.example b/pillar.example index 7c61943..cd758e3 100644 --- a/pillar.example +++ b/pillar.example @@ -7,8 +7,12 @@ letsencrypt: # A list of package/s to install. To find the correct name for the variant # you want to use, check https://certbot.eff.org/all-instructions # Usually, you'll need a single one, but you can also add other plugins here. + # It defaults to installing the `certbot` package, but you can add other + # plugins for authentication/install pkgs: - - python-certbot-apache + - python3-certbot-apache + # - python3-certbot-nginx + # - python3-dns-route53 # Only used for the git install method (use_package: false) cli_install_dir: /opt/letsencrypt # Only used for the git install method (use_package: false). If you want to diff --git a/test/integration/deb/inspec.yml b/test/integration/deb/inspec.yml index 776c6a9..d66aa3e 100644 --- a/test/integration/deb/inspec.yml +++ b/test/integration/deb/inspec.yml @@ -22,4 +22,6 @@ supports: - platform-name: oracle - platform-name: arch - platform-name: gentoo + - platform-name: almalinux + - platform-name: rocky - platform: windows diff --git a/test/integration/git/inspec.yml b/test/integration/git/inspec.yml index f8b7d8b..1d337c6 100644 --- a/test/integration/git/inspec.yml +++ b/test/integration/git/inspec.yml @@ -23,4 +23,6 @@ supports: - platform-name: oracle - platform-name: arch - platform-name: gentoo + - platform-name: almalinux + - platform-name: rocky - platform: windows diff --git a/test/integration/rpm/inspec.yml b/test/integration/rpm/inspec.yml index 59f955e..f8db693 100644 --- a/test/integration/rpm/inspec.yml +++ b/test/integration/rpm/inspec.yml @@ -23,4 +23,6 @@ supports: - platform-name: oracle - platform-name: arch - platform-name: gentoo + - platform-name: almalinux + - platform-name: rocky - platform: windows diff --git a/test/integration/share/inspec.yml b/test/integration/share/inspec.yml index cf623a1..ee20080 100644 --- a/test/integration/share/inspec.yml +++ b/test/integration/share/inspec.yml @@ -19,4 +19,6 @@ supports: - platform-name: oracle - platform-name: arch - platform-name: gentoo + - platform-name: almalinux + - platform-name: rocky - platform: windows diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index 461dea4..87daf08 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -36,7 +36,7 @@ def build_platform_family def build_platform_name case inspec.platform[:name] - when 'amazon', 'oracle' + when 'amazon', 'oracle', 'rocky' "#{inspec.platform[:name]}linux" when /^windows_/ inspec.platform[:family]