Add ubuntu map.jinja #45
Conversation
Syncing fork to the original repository
syncing fork to original
updated repositories entries for sane naming across Debian and Ubuntu entries updated repo entries for security as syntax differs between Debian and Ubuntu added repo entries for -updates (previously known as volatile) updated map to use explicitly use grain os instead of implicitly use os_family removed distribution_updates variable - syntax was Debian specific and invailid for Ubuntu tested against Debian/stretch and Ubuntu/xenial
|
@jdkelleher Thanks for this. We've got a bit of a conflict with #44 now. Let's see if we can find a resolution in that PR, so that this PR can be merged without issues. |
apt/map.jinja
Outdated
| @@ -21,18 +20,68 @@ | |||
| 'default_url': 'http://deb.debian.org/debian/', | |||
| 'default_keyring_package': 'debian-archive-keyring', | |||
| 'repositories': { | |||
| 'sane_default': { | |||
| 'default': { | |||
There was a problem hiding this comment.
@jdkelleher Although I prefer the names you set more than the old ones, changing these will be backward incompatible for users of this formula in the case that the formula was used as-is (with no pillar data): the existing repos sane_default-binary.list and security-stable-binary.list will still exist and the new ones (default-binary.list and default-security-binary.list) will be created, giving a warning that the entries are duplicated.
I'd suggest you keep the old names for the Debian part, so your PR is backward compatible and can be merged. We can later submit another PR to rename these and allow to delete specific entries (which is not currently supported).
wdyt?
There was a problem hiding this comment.
Makes perfect sense to me. I was thinking about the entry deletion gap when I was making updates, but moved forward without a solution.
Should I update and resubmit or is there a cleaner way to bring that into this branch?
There was a problem hiding this comment.
@javierbertoli I just committed the requested updates. Please let me know if anything else is needed. Thanks.
|
@jdkelleher Thanks, this has been merged. @javierbertoli Besides gratitude for the review, let me know when you're ready to merge #44. |
This work was based on a suggestion to update map.jinja instead of pillars.example as had been submitted for pull request #41. While working through the changes needed to include Ubuntu defaults, other bits of neatness were included: