famedly / ansible-collection-network

`famedly.network` ansible collection for network-related services (vpn, reverse proxies, ...)
GNU Affero General Public License v3.0
0 stars 1 forks source link

refactor(proxy46): use harmonized container variable structure #63

Closed jcgruenhage closed 1 month ago

jcgruenhage commented 1 month ago

/fast-forward

github-actions[bot] commented 1 month ago

Triggered from https://github.com/famedly/ansible-collection-network/pull/63#issuecomment-2296111734 by @​jcgruenhage.

Trying to fast forward main (655f040fbb6cbc15e3b5e196623dcb8ca1cb191f) to jcgruenhage/misc-2024-08-16 (91eb1027c5a474b888fe0465eda91f7682b16fdd).

Target branch (main):

commit 655f040fbb6cbc15e3b5e196623dcb8ca1cb191f (HEAD -> main, origin/main, origin/HEAD)
Author: Sammy <s.yilmaz@famedly.com>
Date:   Thu Jun 13 11:51:03 2024 +0200

    chore: add ff-merge workflow

Pull request (jcgruenhage/misc-2024-08-16):

commit 91eb1027c5a474b888fe0465eda91f7682b16fdd (pull_request/jcgruenhage/misc-2024-08-16)
Author: Jan Christian Grünhage <jan.christian@gruenhage.xyz>
Date:   Fri Aug 16 19:01:06 2024 +0200

    refactor(proxy46): use harmonized container variable structure

Can't fast forward main (655f040fbb6cbc15e3b5e196623dcb8ca1cb191f) to jcgruenhage/misc-2024-08-16 (91eb1027c5a474b888fe0465eda91f7682b16fdd). main (655f040fbb6cbc15e3b5e196623dcb8ca1cb191f) is not a direct ancestor of jcgruenhage/misc-2024-08-16 (91eb1027c5a474b888fe0465eda91f7682b16fdd). Branches appear to have diverged at ea23fe08374c60347895f7139d63f65a08dfc29c:

* 91eb1027c5a474b888fe0465eda91f7682b16fdd refactor(proxy46): use harmonized container variable structure
| * 655f040fbb6cbc15e3b5e196623dcb8ca1cb191f chore: add ff-merge workflow
| * ae1f451105ab8c647acb64fec9b23cbd91cf873b feat(traefik): never use proxy for healthcheck, allow overriding healthcheck host
|/  
* ea23fe08374c60347895f7139d63f65a08dfc29c update(traefik): bump version to 2.11.3

commit ea23fe08374c60347895f7139d63f65a08dfc29c
Author: Jan Christian Grünhage <jan.christian@gruenhage.xyz>
Date:   Wed May 22 12:23:51 2024 +0200

    update(traefik): bump version to 2.11.3

Rebase locally, and then force push to jcgruenhage/misc-2024-08-16.

jcgruenhage commented 1 month ago

/fast-forward