Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(debian): use keyrings instead of key_ids #289

Merged

Conversation

javierbertoli
Copy link
Member

PR progress checklist (to be filled in by reviewers)

  • Changes to documentation are appropriate (or tick if not required)
  • Changes to tests are appropriate (or tick if not required)
  • Reviews completed

What type of PR is this?

Primary type

  • [build] Changes related to the build system
  • [chore] Changes to the build process or auxiliary tools and libraries such as documentation generation
  • [ci] Changes to the continuous integration configuration
  • [feat] A new feature
  • [fix] A bug fix
  • [perf] A code change that improves performance
  • [refactor] A code change that neither fixes a bug nor adds a feature
  • [revert] A change used to revert a previous commit
  • [style] Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)

Secondary type

  • [docs] Documentation changes
  • [test] Adding missing or correcting existing tests

Does this PR introduce a BREAKING CHANGE?

No.

Related issues and/or pull requests

Describe the changes you're proposing

Debian family is deprecating the use of GPG keys (managed through apt-key) in favor of keyrings.
This PR adds keyrings both for nginx and passenger when installed from official repositories, and
rewrite the sources.list file accordingly.

Pillar / config required to test the proposed changes

Debug log showing how the proposed changes work

Documentation checklist

  • Updated the README (e.g. Available states).
  • Updated pillar.example.

Testing checklist

  • Included in Kitchen (i.e. under state_top).
  • Covered by new/existing tests (e.g. InSpec, Serverspec, etc.).
  • Updated the relevant test pillar.

Additional context

@javierbertoli javierbertoli force-pushed the debian-family-apt-keyrings branch 2 times, most recently from c57a84d to 9c3e0c7 Compare February 2, 2022 23:38
Copy link
Member

@myii myii left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just some minor changes requested.

docs/README.apt.keyrings.rst Outdated Show resolved Hide resolved
nginx/map.jinja Outdated Show resolved Hide resolved
nginx/pkg.sls Outdated Show resolved Hide resolved
test/integration/passenger/controls/repository.rb Outdated Show resolved Hide resolved
@myii myii merged commit bc86b74 into saltstack-formulas:master Feb 3, 2022
@myii
Copy link
Member

myii commented Feb 3, 2022

Merged, thanks for the PR, @javierbertoli.

@saltstack-formulas-travis

🎉 This PR is included in version 2.8.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@myii
Copy link
Member

myii commented Feb 3, 2022

@baby-gnu Something that might be interesting to discuss in one of the working group meetings (a potential improvement to the system.rb library):

# Inspec does not provide a `codename` matcher, so we add ours
finger_codename = {
'ubuntu-18.04' => 'bionic',
'ubuntu-20.04' => 'focal',
'debian-9' => 'stretch',
'debian-10' => 'buster',
'debian-11' => 'bullseye'
}
codename = finger_codename[system.platform[:finger]]

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants