Skip to content

Commit ff9ea0c

Browse files
committed
Merge branch 'main' into refactor/ufw-custom-resources
Signed-off-by: Dan Webb <dan.webb@damacus.io>
2 parents 0d12f2f + 07b6be0 commit ff9ea0c

8 files changed

Lines changed: 21 additions & 17 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ name: ci
88

99
jobs:
1010
lint-unit:
11-
uses: sous-chefs/.github/.github/workflows/lint-unit.yml@5.0.3
11+
uses: sous-chefs/.github/.github/workflows/lint-unit.yml@main
1212
permissions:
1313
actions: write
1414
checks: write

.github/workflows/conventional-commits.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ name: conventional-commits
1111

1212
jobs:
1313
conventional-commits:
14-
uses: sous-chefs/.github/.github/workflows/conventional-commits.yml@5.0.3
14+
uses: sous-chefs/.github/.github/workflows/conventional-commits.yml@5.0.8

.github/workflows/prevent-file-change.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ name: prevent-file-change
1111

1212
jobs:
1313
prevent-file-change:
14-
uses: sous-chefs/.github/.github/workflows/prevent-file-change.yml@5.0.3
14+
uses: sous-chefs/.github/.github/workflows/prevent-file-change.yml@5.0.8
1515
secrets:
1616
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ permissions:
1616

1717
jobs:
1818
release:
19-
uses: sous-chefs/.github/.github/workflows/release-cookbook.yml@5.0.3
19+
uses: sous-chefs/.github/.github/workflows/release-cookbook.yml@5.0.8
2020
secrets:
2121
token: ${{ secrets.PORTER_GITHUB_TOKEN }}
2222
supermarket_user: ${{ secrets.CHEF_SUPERMARKET_USER }}

.mise.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[env]
2+
_.path = "/opt/chef-workstation/bin"

.rubocop.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
require:
2+
- cookstyle

LIMITATIONS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ custom repository.
3434

3535
### Build Dependencies
3636

37-
| Platform Family | Packages |
38-
|-----------------|----------|
37+
| Platform Family | Packages |
38+
| --------------- | ------------------------------ |
3939
| Debian | None for normal cookbook usage |
4040

4141
`ufw` is packaged as a distro-managed userspace tool and does not require a compiled-from-source

documentation/ufw_ufw_firewall.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ Manage Uncomplicated Firewall (UFW) on Debian and Ubuntu hosts.
44

55
## Actions
66

7-
| Action | Description |
8-
|--------|-------------|
7+
| Action | Description |
8+
|-----------|---------------------------------------------------------------------------------|
99
| `:create` | Installs UFW, enables the firewall, and applies the resolved rule set (default) |
10-
| `:delete` | Disables UFW, resets its rules, and purges the package |
10+
| `:delete` | Disables UFW, resets its rules, and purges the package |
1111

1212
## Properties
1313

14-
| Property | Type | Default | Description |
15-
|----------|------|---------|-------------|
16-
| `firewall_name` | String | `name property` | Logical firewall name passed to the `firewall` cookbook resources |
17-
| `rules` | Array, Hash | `{}` | Explicit firewall rules to apply |
18-
| `allow_ssh` | true, false | `true` | Opens TCP port 22 before applying custom rules |
19-
| `data_bag_name` | String, nil | `nil` | Data bag to scan for additional rules keyed by role or recipe name |
20-
| `collect_recipe_rules` | true, false | `false` | Merges legacy `node['<recipe>']['firewall']['rules']` values into the final rule set |
21-
| `securitylevel` | String, nil | `nil` | Enables SecurityLevel role validation before applying rules |
14+
| Property | Type | Default | Description |
15+
|------------------------|-------------|-----------------|--------------------------------------------------------------------------------------|
16+
| `firewall_name` | String | `name property` | Logical firewall name passed to the `firewall` cookbook resources |
17+
| `rules` | Array, Hash | `{}` | Explicit firewall rules to apply |
18+
| `allow_ssh` | true, false | `true` | Opens TCP port 22 before applying custom rules |
19+
| `data_bag_name` | String, nil | `nil` | Data bag to scan for additional rules keyed by role or recipe name |
20+
| `collect_recipe_rules` | true, false | `false` | Merges legacy `node['<recipe>']['firewall']['rules']` values into the final rule set |
21+
| `securitylevel` | String, nil | `nil` | Enables SecurityLevel role validation before applying rules |
2222

2323
## Examples
2424

0 commit comments

Comments
 (0)