Link Classic -> Link Next updates #26

Open
darren wants to merge 2 commits from darren/ansible-collection-apps:link-next into main
First-time contributor
No description provided.
Owner
  • Leave only components that need to talk to each other on channels.network

  • roles/podman_link/templates/home/config/systemd/user/link.target -> would prefer to keep this depending only on zammad-nginx; and have zammad-nginx depend on the bridge services instead
    (and add PartOf=zammad-nginx.service for the bridge services)

  • remove PartOf=link.target where it's been added spuriously, it should only go on zammad-nginx

- Leave only components that need to talk to each other on channels.network - roles/podman_link/templates/home/config/systemd/user/link.target -> would prefer to keep this depending only on zammad-nginx; and have zammad-nginx depend on the bridge services instead (and add PartOf=zammad-nginx.service for the bridge services) - remove PartOf=link.target where it's been added spuriously, it should only go on zammad-nginx
This pull request has changes conflicting with the target branch.
  • roles/podman_link/defaults/main.yml
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u link-next:darren-link-next
git switch darren-link-next

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff darren-link-next
git switch darren-link-next
git rebase main
git switch main
git merge --ff-only darren-link-next
git switch darren-link-next
git rebase main
git switch main
git merge --no-ff darren-link-next
git switch main
git merge --squash darren-link-next
git switch main
git merge --ff-only darren-link-next
git switch main
git merge darren-link-next
git push origin main
Sign in to join this conversation.
No description provided.