Skip to content

Commit 6b6f99f

Browse files
authored
Merge branch 'main' into ssh-keys-add-debian-13-support
2 parents e45258d + 7fc4f27 commit 6b6f99f

File tree

8 files changed

+48
-57
lines changed

8 files changed

+48
-57
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
uses: "actions/checkout@v6"
2525

2626
- name: "Lint code."
27-
uses: "ansible/ansible-lint@v25.11.1"
27+
uses: "ansible/ansible-lint@v25.12.1"

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## [v6.3.2](https://github.com/hifis-net/ansible-collection-toolkit/tree/v6.3.2) (2025-12-01)
4+
5+
[Full Changelog](https://github.com/hifis-net/ansible-collection-toolkit/compare/v6.3.1...v6.3.2)
6+
7+
**Merged pull requests:**
8+
9+
- Prepare release version 6.3.2 [\#541](https://github.com/hifis-net/ansible-collection-toolkit/pull/541) ([Normo](https://github.com/Normo))
10+
- gitlab: restrict file permission for gitlab.rb [\#540](https://github.com/hifis-net/ansible-collection-toolkit/pull/540) [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([Normo](https://github.com/Normo))
11+
- gitlab: fix sensitive information disclosure [\#539](https://github.com/hifis-net/ansible-collection-toolkit/pull/539) [[gitlab](https://github.com/hifis-net/ansible-collection-toolkit/labels/gitlab)] ([Normo](https://github.com/Normo))
12+
313
## [v6.3.1](https://github.com/hifis-net/ansible-collection-toolkit/tree/v6.3.1) (2025-11-28)
414

515
[Full Changelog](https://github.com/hifis-net/ansible-collection-toolkit/compare/v6.3.0...v6.3.1)

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ authors:
3636
orcid: 'https://orcid.org/0000-0002-5028-6663'
3737
repository-code: 'https://github.com/hifis-net/ansible-collection-toolkit'
3838
repository-artifact: 'https://galaxy.ansible.com/ui/repo/published/hifis/toolkit/'
39-
version: v6.3.1'
40-
date-released: '2025-11-28'
39+
version: v6.3.2'
40+
date-released: '2025-12-01'

galaxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace: 'hifis'
77
name: 'toolkit'
8-
version: '6.3.1'
8+
version: '6.3.2'
99
readme: 'README.md'
1010
authors:
1111
- 'HIFIS Software Services <support@hifis.net>'

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
[project]
77
name = "ansible-collection-toolkit"
8-
version = "6.3.1"
8+
version = "6.3.2"
99
description = "This collection provides production-ready Ansible roles used for providing services used in research and by research software engineers, but not exclusively."
1010
readme = "README.md"
1111
requires-python = ">=3.11"

roles/gitlab/tasks/check.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
__gitlab_registry_config: "{{ item.registry }}"
2424
when: "item.registry is defined"
2525
loop: "{{ gitlab_additional_configurations }}"
26+
no_log: "{{ gitlab_hide_sensitive_changes }}"
2627

2728
- name: "Check if database key is defined in registry"
2829
ansible.builtin.set_fact:

roles/gitlab/tasks/configure.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
ansible.builtin.set_fact:
3232
__gitaly_item: "{{ item.gitaly }}"
3333
with_items: "{{ gitlab_additional_configurations }}"
34+
no_log: "{{ gitlab_hide_sensitive_changes }}"
3435

3536
- name: "Check if gitaly['configuration'] is present"
3637
when:
@@ -39,6 +40,7 @@
3940
ansible.builtin.set_fact:
4041
__gitaly_configuration_exists: true
4142
with_items: "{{ __gitaly_item | default([]) }}"
43+
no_log: "{{ gitlab_hide_sensitive_changes }}"
4244

4345
- name: "Warn if gitaly['configuration'] is already present"
4446
when:
@@ -53,7 +55,7 @@
5355
dest: "{{ gitlab_configuration_file_path }}"
5456
owner: "root"
5557
group: "root"
56-
mode: "0644"
58+
mode: "0600"
5759
no_log: "{{ gitlab_hide_sensitive_changes }}"
5860
notify:
5961
- "Reconfigure Primary GitLab"

uv.lock

Lines changed: 29 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)