fix(repositories): force aptkey if signed-by and allow aptkey #77
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
b2a8458 to
ed5c2a3
Compare
31e228f to
37042f5
Compare
6874579 to
74cd91e
Compare
|
I also :
|
5d2e90b to
9058b32
Compare
featuresThe additional features from my side. Describe the changes you're proposing
Pillar / config required to test the proposed changesapt:
clean_sources_list_d: true
respositories:
rabbitmq:
unmanaged: true # useful when rabbitmq.list is managed by another formula
filename: rabbitmq.list # this is optional, will use <repo-name>.list by default, instead of "<repo-name>-<type>.list"Documentation checklist
Testing checklist
Additional contextAdded a Salt state to the tests to verify it isn't removed. repos_maintained_by_another_formula:
file.managed:
- name: /etc/apt/sources.list.d/unmanaged.list
- mode: '0644'
- contents: "## unmanged list file that shouldn't be removed"
|
|
Closing this PR to split changes and use specific branches. |
19 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR progress checklist (to be filled in by reviewers)
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 testsDoes this PR introduce a
BREAKING CHANGE?No.
Related issues and/or pull requests
#76
Describe the changes you're proposing
If key_url is definedand aptkey is not defined, force aptkey to false when signed-by is present in opts.
Use aptkey if defined in any case.
Allow to define keyring directory and clean this directory (cleaning is set to false by default)
Pillar / config required to test the proposed changes
Added to pillar.example
Debug log showing how the proposed changes work
Documentation checklist
README(e.g.Available states).pillar.example.Testing checklist
state_top).Additional context
keyring directory is managed automatically by salt not by this formula (didn't see any possible configuration in pkgrepo to change this) The directory is just set to be able to clean this directory.
It should be better to define all the signed-by in the same directory (except for keyrings pushed by the keyring_package)