diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c02ed90..a94662c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,4 +24,4 @@ jobs: uses: "actions/checkout@v4" - name: "Lint code." - uses: "ansible/ansible-lint@v25.5.0" + uses: "ansible/ansible-lint@v25.6.0" diff --git a/CHANGELOG.md b/CHANGELOG.md index e2aee89..e9a6bdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## [v6.0.1](https://github.com/hifis-net/ansible-collection-toolkit/tree/v6.0.1) (2025-06-19) + +[Full Changelog](https://github.com/hifis-net/ansible-collection-toolkit/compare/v6.0.0...v6.0.1) + +**Merged pull requests:** + +- Add host header to Zammad nginx config [\#443](https://github.com/hifis-net/ansible-collection-toolkit/pull/443) [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] ([tobiashuste](https://github.com/tobiashuste)) +- Bump ansible/ansible-lint from 25.5.0 to 25.6.0 [\#442](https://github.com/hifis-net/ansible-collection-toolkit/pull/442) ([dependabot[bot]](https://github.com/apps/dependabot)) +- Bump ansible from 11.6.0 to 11.7.0 [\#441](https://github.com/hifis-net/ansible-collection-toolkit/pull/441) ([dependabot[bot]](https://github.com/apps/dependabot)) + ## [v6.0.0](https://github.com/hifis-net/ansible-collection-toolkit/tree/v6.0.0) (2025-06-04) [Full Changelog](https://github.com/hifis-net/ansible-collection-toolkit/compare/v5.3.0...v6.0.0) @@ -18,36 +28,26 @@ **Fixed bugs:** -- Disable apt cache updates when removing repositories from sources.list [\#432](https://github.com/hifis-net/ansible-collection-toolkit/pull/432) [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([Normo](https://github.com/Normo)) - Replace obsolete occurrences of Pipfile [\#409](https://github.com/hifis-net/ansible-collection-toolkit/pull/409) [[unattended_upgrades](https://github.com/hifis-net/ansible-collection-toolkit/labels/unattended_upgrades)] [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] [[ssh_keys](https://github.com/hifis-net/ansible-collection-toolkit/labels/ssh_keys)] [[gitlab_runner](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab_runner)] [[keepalived](https://github.com/hifis-net/ansible-collection-toolkit/labels/keepalived)] [[haproxy](https://github.com/hifis-net/ansible-collection-toolkit/labels/haproxy)] [[netplan](https://github.com/hifis-net/ansible-collection-toolkit/labels/netplan)] [[redis](https://github.com/hifis-net/ansible-collection-toolkit/labels/redis)] [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([Normo](https://github.com/Normo)) +- Disable apt cache updates when removing repositories from sources.list [\#432](https://github.com/hifis-net/ansible-collection-toolkit/pull/432) [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([Normo](https://github.com/Normo)) **Closed issues:** -- Remove official support for EOL Ubuntu 20.04 [\#435](https://github.com/hifis-net/ansible-collection-toolkit/issues/435) - unattended upgrades unattended\_apt\_daily\_upgrade\_oncalendar is not scheduled [\#429](https://github.com/hifis-net/ansible-collection-toolkit/issues/429) - unattended upgrades are not scheduled correctly [\#426](https://github.com/hifis-net/ansible-collection-toolkit/issues/426) +- Remove official support for EOL Ubuntu 20.04 [\#435](https://github.com/hifis-net/ansible-collection-toolkit/issues/435) - Fix apt-key deprecation [\#412](https://github.com/hifis-net/ansible-collection-toolkit/issues/412) [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] **Merged pull requests:** -- Prepare release version 6.0.0 [\#437](https://github.com/hifis-net/ansible-collection-toolkit/pull/437) [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] [[gitlab_runner](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab_runner)] [[haproxy](https://github.com/hifis-net/ansible-collection-toolkit/labels/haproxy)] ([Normo](https://github.com/Normo)) - Remove official support for EOL Ubuntu 20.04 [\#436](https://github.com/hifis-net/ansible-collection-toolkit/pull/436) [[unattended_upgrades](https://github.com/hifis-net/ansible-collection-toolkit/labels/unattended_upgrades)] [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] [[ssh_keys](https://github.com/hifis-net/ansible-collection-toolkit/labels/ssh_keys)] [[gitlab_runner](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab_runner)] [[keepalived](https://github.com/hifis-net/ansible-collection-toolkit/labels/keepalived)] [[haproxy](https://github.com/hifis-net/ansible-collection-toolkit/labels/haproxy)] [[netplan](https://github.com/hifis-net/ansible-collection-toolkit/labels/netplan)] [[redis](https://github.com/hifis-net/ansible-collection-toolkit/labels/redis)] [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([Normo](https://github.com/Normo)) -- Test gitlab-runner version 18.0.2 with molecule [\#434](https://github.com/hifis-net/ansible-collection-toolkit/pull/434) [[gitlab_runner](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab_runner)] ([Normo](https://github.com/Normo)) -- Install HAProxy 3.2 by default [\#433](https://github.com/hifis-net/ansible-collection-toolkit/pull/433) [[haproxy](https://github.com/hifis-net/ansible-collection-toolkit/labels/haproxy)] ([Normo](https://github.com/Normo)) - Bump ansible/ansible-lint from 25.4.0 to 25.5.0 [\#431](https://github.com/hifis-net/ansible-collection-toolkit/pull/431) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Allow users to overwrite gitlab\_rails\['repositories\_storages'\] [\#430](https://github.com/hifis-net/ansible-collection-toolkit/pull/430) [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([tobiashuste](https://github.com/tobiashuste)) -- Remove support for Ansible EOL 2.16 [\#428](https://github.com/hifis-net/ansible-collection-toolkit/pull/428) [[unattended_upgrades](https://github.com/hifis-net/ansible-collection-toolkit/labels/unattended_upgrades)] [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] [[ssh_keys](https://github.com/hifis-net/ansible-collection-toolkit/labels/ssh_keys)] [[gitlab_runner](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab_runner)] [[keepalived](https://github.com/hifis-net/ansible-collection-toolkit/labels/keepalived)] [[haproxy](https://github.com/hifis-net/ansible-collection-toolkit/labels/haproxy)] [[netplan](https://github.com/hifis-net/ansible-collection-toolkit/labels/netplan)] [[redis](https://github.com/hifis-net/ansible-collection-toolkit/labels/redis)] [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([Normo](https://github.com/Normo)) -- Install Redis 8 by default [\#425](https://github.com/hifis-net/ansible-collection-toolkit/pull/425) [[redis](https://github.com/hifis-net/ansible-collection-toolkit/labels/redis)] ([Normo](https://github.com/Normo)) - Do not pin GitLab in Molecule [\#424](https://github.com/hifis-net/ansible-collection-toolkit/pull/424) [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([tobiashuste](https://github.com/tobiashuste)) - Bump ansible from 11.3.0 to 11.6.0 [\#423](https://github.com/hifis-net/ansible-collection-toolkit/pull/423) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Remove deprecated keepalived\_notification\_email variable from keepalived role [\#421](https://github.com/hifis-net/ansible-collection-toolkit/pull/421) [[keepalived](https://github.com/hifis-net/ansible-collection-toolkit/labels/keepalived)] ([Normo](https://github.com/Normo)) -- Remove deprecated elasticsearch\_url variable from zammad role [\#420](https://github.com/hifis-net/ansible-collection-toolkit/pull/420) [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] ([Normo](https://github.com/Normo)) - Install Zammad 6.5.0 by default [\#419](https://github.com/hifis-net/ansible-collection-toolkit/pull/419) [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] ([tobiashuste](https://github.com/tobiashuste)) - Ensure role workflows are running when prepare-action is updated [\#418](https://github.com/hifis-net/ansible-collection-toolkit/pull/418) [[unattended_upgrades](https://github.com/hifis-net/ansible-collection-toolkit/labels/unattended_upgrades)] [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] [[ssh_keys](https://github.com/hifis-net/ansible-collection-toolkit/labels/ssh_keys)] [[gitlab_runner](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab_runner)] [[keepalived](https://github.com/hifis-net/ansible-collection-toolkit/labels/keepalived)] [[haproxy](https://github.com/hifis-net/ansible-collection-toolkit/labels/haproxy)] [[netplan](https://github.com/hifis-net/ansible-collection-toolkit/labels/netplan)] [[redis](https://github.com/hifis-net/ansible-collection-toolkit/labels/redis)] [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([Normo](https://github.com/Normo)) - Bump ansible/ansible-lint from 25.1.3 to 25.4.0 [\#417](https://github.com/hifis-net/ansible-collection-toolkit/pull/417) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Replace git\_data\_dirs [\#416](https://github.com/hifis-net/ansible-collection-toolkit/pull/416) [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([tobiashuste](https://github.com/tobiashuste)) - Bump astral-sh/setup-uv from 5 to 6 in /.github/workflows/prepare-action [\#415](https://github.com/hifis-net/ansible-collection-toolkit/pull/415) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Use deb822\_repository module to add apt repositories [\#413](https://github.com/hifis-net/ansible-collection-toolkit/pull/413) [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([Normo](https://github.com/Normo)) - Replace pipenv by uv [\#406](https://github.com/hifis-net/ansible-collection-toolkit/pull/406) [[unattended_upgrades](https://github.com/hifis-net/ansible-collection-toolkit/labels/unattended_upgrades)] [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] [[ssh_keys](https://github.com/hifis-net/ansible-collection-toolkit/labels/ssh_keys)] [[gitlab_runner](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab_runner)] [[keepalived](https://github.com/hifis-net/ansible-collection-toolkit/labels/keepalived)] [[haproxy](https://github.com/hifis-net/ansible-collection-toolkit/labels/haproxy)] [[netplan](https://github.com/hifis-net/ansible-collection-toolkit/labels/netplan)] [[redis](https://github.com/hifis-net/ansible-collection-toolkit/labels/redis)] [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([tobiashuste](https://github.com/tobiashuste)) - Bump artis3n/ansible\_galaxy\_collection from 2.10.1 to 2.11.0 [\#405](https://github.com/hifis-net/ansible-collection-toolkit/pull/405) ([dependabot[bot]](https://github.com/apps/dependabot)) - Remove Docker 28 IPV6 related fix [\#404](https://github.com/hifis-net/ansible-collection-toolkit/pull/404) [[gitlab_runner](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab_runner)] ([tobiashuste](https://github.com/tobiashuste)) @@ -57,6 +57,16 @@ - Bump ansible-lint from 25.1.2 to 25.1.3 [\#399](https://github.com/hifis-net/ansible-collection-toolkit/pull/399) ([dependabot[bot]](https://github.com/apps/dependabot)) - Bump ansible/ansible-lint from 25.1.2 to 25.1.3 [\#398](https://github.com/hifis-net/ansible-collection-toolkit/pull/398) ([dependabot[bot]](https://github.com/apps/dependabot)) - Bump molecule from 24.12.0 to 25.2.0 [\#397](https://github.com/hifis-net/ansible-collection-toolkit/pull/397) ([Normo](https://github.com/Normo)) +- Prepare release version 6.0.0 [\#437](https://github.com/hifis-net/ansible-collection-toolkit/pull/437) [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] [[gitlab_runner](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab_runner)] [[haproxy](https://github.com/hifis-net/ansible-collection-toolkit/labels/haproxy)] ([Normo](https://github.com/Normo)) +- Test gitlab-runner version 18.0.2 with molecule [\#434](https://github.com/hifis-net/ansible-collection-toolkit/pull/434) [[gitlab_runner](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab_runner)] ([Normo](https://github.com/Normo)) +- Install HAProxy 3.2 by default [\#433](https://github.com/hifis-net/ansible-collection-toolkit/pull/433) [[haproxy](https://github.com/hifis-net/ansible-collection-toolkit/labels/haproxy)] ([Normo](https://github.com/Normo)) +- Allow users to overwrite gitlab\_rails\['repositories\_storages'\] [\#430](https://github.com/hifis-net/ansible-collection-toolkit/pull/430) [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([tobiashuste](https://github.com/tobiashuste)) +- Remove support for Ansible EOL 2.16 [\#428](https://github.com/hifis-net/ansible-collection-toolkit/pull/428) [[unattended_upgrades](https://github.com/hifis-net/ansible-collection-toolkit/labels/unattended_upgrades)] [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] [[ssh_keys](https://github.com/hifis-net/ansible-collection-toolkit/labels/ssh_keys)] [[gitlab_runner](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab_runner)] [[keepalived](https://github.com/hifis-net/ansible-collection-toolkit/labels/keepalived)] [[haproxy](https://github.com/hifis-net/ansible-collection-toolkit/labels/haproxy)] [[netplan](https://github.com/hifis-net/ansible-collection-toolkit/labels/netplan)] [[redis](https://github.com/hifis-net/ansible-collection-toolkit/labels/redis)] [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([Normo](https://github.com/Normo)) +- Install Redis 8 by default [\#425](https://github.com/hifis-net/ansible-collection-toolkit/pull/425) [[redis](https://github.com/hifis-net/ansible-collection-toolkit/labels/redis)] ([Normo](https://github.com/Normo)) +- Remove deprecated keepalived\_notification\_email variable from keepalived role [\#421](https://github.com/hifis-net/ansible-collection-toolkit/pull/421) [[keepalived](https://github.com/hifis-net/ansible-collection-toolkit/labels/keepalived)] ([Normo](https://github.com/Normo)) +- Remove deprecated elasticsearch\_url variable from zammad role [\#420](https://github.com/hifis-net/ansible-collection-toolkit/pull/420) [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] ([Normo](https://github.com/Normo)) +- Replace git\_data\_dirs [\#416](https://github.com/hifis-net/ansible-collection-toolkit/pull/416) [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([tobiashuste](https://github.com/tobiashuste)) +- Use deb822\_repository module to add apt repositories [\#413](https://github.com/hifis-net/ansible-collection-toolkit/pull/413) [[zammad](https://github.com/hifis-net/ansible-collection-toolkit/labels/zammad)] [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([Normo](https://github.com/Normo)) ## [v5.3.0](https://github.com/hifis-net/ansible-collection-toolkit/tree/v5.3.0) (2025-02-18) diff --git a/CITATION.cff b/CITATION.cff index 6011f29..16c422c 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -36,5 +36,5 @@ authors: orcid: 'https://orcid.org/0000-0002-5028-6663' repository-code: 'https://github.com/hifis-net/ansible-collection-toolkit' repository-artifact: 'https://galaxy.ansible.com/ui/repo/published/hifis/toolkit/' -version: v6.0.0' -date-released: '2025-06-04' +version: v6.0.1' +date-released: '2025-06-19' diff --git a/galaxy.yml b/galaxy.yml index d9f3b21..303b71b 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -5,7 +5,7 @@ namespace: 'hifis' name: 'toolkit' -version: '6.0.0' +version: '6.0.1' readme: 'README.md' authors: - 'HIFIS Software Services ' diff --git a/roles/zammad/templates/nginx-zammad.conf.j2 b/roles/zammad/templates/nginx-zammad.conf.j2 index 4fbaae1..9428454 100644 --- a/roles/zammad/templates/nginx-zammad.conf.j2 +++ b/roles/zammad/templates/nginx-zammad.conf.j2 @@ -61,6 +61,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; + proxy_set_header Host $http_host; proxy_set_header CLIENT_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; diff --git a/uv.lock b/uv.lock index 139ad8b..647be76 100644 --- a/uv.lock +++ b/uv.lock @@ -8,14 +8,14 @@ resolution-markers = [ [[package]] name = "ansible" -version = "11.6.0" +version = "11.7.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "ansible-core" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/a6/6f/b491cd89e0393810b67598098ccb6a204d6a9202c9733a541568f69f6dea/ansible-11.6.0.tar.gz", hash = "sha256:934a948caa3ec1a3eb277e7ab1638b808b074a6e0c46045794cde7b637e275d8", size = 44015165, upload-time = "2025-05-20T20:28:24.184Z" } +sdist = { url = "https://files.pythonhosted.org/packages/83/31/1fe54cfce344fff6ef17933705c2a5ecf2af29301e8d1af13dd1b3f14e3f/ansible-11.7.0.tar.gz", hash = "sha256:f9df37c71d407f65bcb9c5c06c9918e297d9ea74b5cdaf5926c4c9aa9e44db5f", size = 44365403, upload-time = "2025-06-17T19:38:22.081Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/ef/92/8aebdbdd4574d337e47ebb7171fdc83095b82c255f8362f96681b113b79d/ansible-11.6.0-py3-none-any.whl", hash = "sha256:5b9c19d6a1080011c14c821bc7e6f8fd5b2a392219cbf2ced9be05e6d447d8cd", size = 55488595, upload-time = "2025-05-20T20:28:17.672Z" }, + { url = "https://files.pythonhosted.org/packages/d4/3a/4e6005176766287496a4bd057b4831a5888d02a94984d822fa5aed5ccec9/ansible-11.7.0-py3-none-any.whl", hash = "sha256:caa56fc92e5bea012abf37f08aa348da27d2fcaf94bf398e24cadcb618a4dc3b", size = 55838653, upload-time = "2025-06-17T19:38:17.421Z" }, ] [[package]]