repositories: fix keys and archs

[SMillerDev]

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
• [x] [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

https://github.com/saltstack-formulas/salt-formula/issues/545 https://github.com/saltstack-formulas/salt-formula/issues/539

Describe the changes you're proposing

Move to onedir packages by default Set the OS architecture in debian based repos

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

[lmf-mx]

@SMillerDev This does actually break existing deployments and should be noted.

• It doesn't cover Ubuntu 22.04 on 3005 onedir, which uses https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/3005/salt-archive-keyring.gpg.
• It also doesn't cover older releases that don't support onedir.

That said, I don't think it's the wrong direction, but there's some things still amiss.

• IMO, everything should go to onedir or better yet, default to it with a pillar override, before new versions that don't support the classic packages are released.
• Specifically in the Ubuntu mapping, key_url points to a place that doesn't exist for 22.04, since it doesn't include the onedir "salt/" dir in the path.

[jeff350]

@SMillerDev It was clarified in a salt issue that the -2023 on the key is the year the key was generated. So this PR should go to 2023 being hard coded instead of the jinja to get the current year.

https://github.com/saltstack/salt/issues/64144#issuecomment-1589982446

[SMillerDev]

Thanks for the heads up, I'll fix that.

[lmf-mx]

I think there are a few more small changes to fix the urls of repos.

Could you please look at this and modify your commit messages to follow the format that will pass the commitlint in CI. you can see this here https://gitlab.com/saltstack-formulas/salt-formula/-/jobs/4471523712#L125

@SMillerDev Can you update the commit messages to pass the linter?

[SMillerDev]

I will once I actually get it to work

[lmf-mx]

I will once I actually get it to work

If you mean the formula, I believe I've covered all the cases in the update based on your PR, #550 If you mean the messages, you can interactive rebase and force push, https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/changing-a-commit-message

[techhat]

FYI, SALTSTACK-GPG-KEY.pub no longer exists in the repo, so without some of these changes I'm finding that the most recent release of this formula is now unusable in multiple OSs. @Ch3ll