Skip to content
This repository has been archived by the owner on Jun 25, 2023. It is now read-only.

Moved configuration into a new file that doesn't overwrite default settings #66

Closed
wants to merge 2 commits into from
Closed

Moved configuration into a new file that doesn't overwrite default settings #66

wants to merge 2 commits into from

Conversation

colans
Copy link

@colans colans commented Sep 9, 2019

See #32 for details.

@colans colans changed the title Moved configuration into a new files that doesn't overwrite default settings Moved configuration into a new file that doesn't overwrite default settings Sep 9, 2019
@jnv
Copy link
Owner

jnv commented Sep 12, 2019

This is awesome, thank you Colan! I would like to bundle this change along with other breaking changes into next major release, I will prepare a new branch and include your PR there.

@colans
Copy link
Author

colans commented Jan 22, 2021 •
edited
Loading

@jnv It's now been over a year. Would you have some time to merge this, and ideally cut a new release on Galaxy? Thanks! Just noticed the conflicts. I'll take a look at them.

@jnv
Copy link
Owner

jnv commented Jan 22, 2021

Thanks! I would like to first move the testing infra from Travis to GitHub Actions, I'll try to find a time for this next week.

@colans
Issue jnv#32, PR !66: Merge branch 'master' into stop_overwriting_def…
878a3d2 
…ault_config

CONFLICT (content): Merge conflict in templates/unattended-upgrades.j2
  * Resolution: Added `ansible_controlled` header.
CONFLICT (modify/delete): templates/auto-upgrades.j2 deleted in HEAD and modified in master. Version master of templates/auto-upgrades.j2 left in tree.
  * Resolution: Deleted file again as nothing new had been added (except the `ansible_controlled` header).
@colans
Copy link
Author

colans commented Jan 27, 2021

This should now be good to go, assuming all checks are successful. If you're cool with this, @jnv , this should also close #32. There's additional discussion in there, but I don't believe it does anything more for us.

(I can't speak to GitHub Actions; we do everything in GitLab.com's CI. In fact, I haven't even been on GitHub in a while now and it looks like there's no way to refer to an MR in a commit message, or as they call them here, PRs ;)

@jnv jnv mentioned this pull request Feb 8, 2021
Closed
@dale-c-anderson dale-c-anderson mentioned this pull request Apr 23, 2021
Closed
@colans
Copy link
Author

colans commented Aug 24, 2021

@jnv Any chance you can merge this soon, and close #32 ? Thanks!

@iamdevnull
Copy link

It would be great if this could be merged plz.

Thx

@jnv
Copy link
Owner

jnv commented Oct 20, 2021

Hey, sorry for ignoring this for so long, I have many other things going on and don't use this role so this is very low on my list of priorities.

The PR looks good, however I am afraid of introducing regressions. There's a WIP branch there I'd like to migrate tests away from Travis to GitHub actions with Molecule: #84. If someone could help me to push this forward.

I think I could also merge this and push it into a pre-release to finally unblock it.

@jnv jnv mentioned this pull request May 23, 2022
Closed
@jnv
Copy link
Owner

jnv commented May 23, 2022

I am closing this PR since this role has been deprecated. Feel free to suggest alternatives in #98.

@jnv jnv closed this May 23, 2022
@colans colans mentioned this pull request Aug 16, 2022
Closed
@colans
Copy link
Author

colans commented Aug 16, 2022

I requested that this be merged via the issue in the new project @ hifis-net/ansible-collection-toolkit#10.

@alpha0010 alpha0010 mentioned this pull request Sep 21, 2022
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@colans @jnv @iamdevnull