Skip to content

Commit 58b8a05

Browse files
Add Debian 13 and minor adjustments
1 parent c3668c6 commit 58b8a05

8 files changed

Lines changed: 52 additions & 8 deletions

File tree

.ansible-lint

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ skip_list:
66
- 'no-changed-when'
77
- 'command-instead-of-module'
88
- 'command-instead-of-shell'
9+
- 'schema[meta]'

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ name: CI
88

99
defaults:
1010
run:
11-
working-directory: 'HomeSecExplorer.pihole'
11+
working-directory: 'HomeSecExplorer.cloudflared'
1212

1313
jobs:
1414

@@ -19,7 +19,7 @@ jobs:
1919
- name: Check out the codebase
2020
uses: actions/checkout@v4
2121
with:
22-
path: 'HomeSecExplorer.pihole'
22+
path: 'HomeSecExplorer.cloudflared'
2323

2424
- name: Set up Python 3
2525
uses: actions/setup-python@v5
@@ -53,7 +53,7 @@ jobs:
5353
- name: Check out the codebase
5454
uses: actions/checkout@v4
5555
with:
56-
path: 'HomeSecExplorer.pihole'
56+
path: 'HomeSecExplorer.cloudflared'
5757

5858
- name: Set up Python 3
5959
uses: actions/setup-python@v5

.github/workflows/release.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
# This workflow requires a GALAXY_API_KEY secret present in the GitHub
3+
# repository or organization.
4+
#
5+
# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
6+
# See: https://github.com/ansible/galaxy/issues/46
7+
8+
name: Release
9+
'on':
10+
push:
11+
tags:
12+
- '*'
13+
14+
defaults:
15+
run:
16+
working-directory: 'HomeSecExplorer.cloudflared'
17+
18+
jobs:
19+
20+
release:
21+
name: Release
22+
runs-on: ubuntu-latest
23+
steps:
24+
- name: Check out the codebase.
25+
uses: actions/checkout@v4
26+
with:
27+
path: 'HomeSecExplorer.cloudflared'
28+
29+
- name: Set up Python 3.
30+
uses: actions/setup-python@v5
31+
with:
32+
python-version: '3.x'
33+
34+
- name: Install Ansible.
35+
run: pip3 install ansible-core
36+
37+
- name: Trigger a new import on Galaxy.
38+
run: >-
39+
ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }}
40+
$(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Each cloudflared service instance runs on its own port and configuration, allowi
3030

3131
## Supported Operating Systems
3232

33-
- Debian 11 (Bullseye), 12 (Bookworm)
33+
- Debian 11 (Bullseye), 12 (Bookworm), 13 (Trixie)
3434
- Ubuntu 22.04 (Jammy), 24.04 (Noble)
3535
- Rocky 9 (Blue Onyx)
3636

@@ -42,6 +42,7 @@ Each cloudflared service instance runs on its own port and configuration, allowi
4242

4343
| Distro | Version | Manually verified | CI | Notes |
4444
|:-------|:--------|:-----------------:|:--:|:-----|
45+
| Debian | 13 | :white_check_mark: | :repeat: | |
4546
| Debian | 12 | :white_check_mark: | :repeat: | |
4647
| Debian | 11 | :white_circle: | :repeat: | |
4748
| Ubuntu | 24.04 | :white_check_mark: | :repeat: | |

meta/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ galaxy_info:
66
Supports multi-instance setup, GitHub/APT install, updates, and
77
integrates with Pi-hole via the HomeSecExplorer.pihole role.
88
role_name: cloudflared
9-
namespace: homesecexplorer
9+
namespace: HomeSecExplorer
1010
license: MIT
1111
min_ansible_version: '2.13'
1212

1313
platforms:
1414
- name: Debian
1515
versions:
16+
- trixie
1617
- bookworm
1718
- bullseye
1819
- name: Ubuntu

molecule/default/molecule.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ driver:
99
name: docker
1010

1111
platforms:
12-
- name: ${MOLECULE_DISTRO:-debian12}
13-
image: geerlingguy/docker-${MOLECULE_DISTRO:-debian12}-ansible
12+
- name: ${MOLECULE_DISTRO:-debian13}
13+
image: geerlingguy/docker-${MOLECULE_DISTRO:-debian13}-ansible
1414
pre_build_image: true
1515
privileged: true
1616
cgroupns_mode: host

tasks/cloudflared-setFacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
register: cloudflared_command
99
- name: Set fact - cloudflared installed
1010
ansible.builtin.set_fact:
11-
cloudflared_installed: "{{ 'cloudflared version' in cloudflared_command.stdout | default(false) }}"
11+
cloudflared_installed: "{{ cloudflared_command.rc == 0 | default(false) }}"

tasks/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
- os_identifier in [
1212
"debian-11",
1313
"debian-12",
14+
"debian-13",
1415
"ubuntu-22.04",
1516
"ubuntu-24.04",
1617
"rocky-8",

0 commit comments

Comments
 (0)