Skip to content

Commit 589d1ed

Browse files
committed
Allow -_ in ipset name
1 parent 6620ad2 commit 589d1ed

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

REFERENCE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@ Data type: `Optional[Enum['none', 'ipsec']]`
879879

880880
##### `ipset`
881881

882-
Data type: `Optional[Variant[Pattern[/^(?:!\s)?\w+\s(?:src|dst)(?:,src|,dst)?$/], Array[Pattern[/^(?:!\s)?\w+\s(?:src|dst)(?:,src|,dst)?$/]]]]`
882+
Data type: `Optional[Variant[Pattern[/^(?:!\s)?[\w\-_]+\s(?:src|dst)(?:,src|,dst)?$/], Array[Pattern[/^(?:!\s)?[\w\-_]+\s(?:src|dst)(?:,src|,dst)?$/]]]]`
883883
_*this data type contains a regex that may not be accurately reflected in generated documentation_
884884

885885
Matches against the specified ipset list.

lib/puppet/type/firewall.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -948,8 +948,7 @@
948948
DESC
949949
},
950950
ipset: {
951-
type: 'Optional[Variant[Pattern[/^(?:!\s)?\w+\s(?:src|dst)(?:,src|,dst)?$/], Array[Pattern[/^(?:!\s)?\w+\s(?:src|dst)(?:,src|,dst)?$/]]]]',
952-
desc: <<-DESC
951+
type: 'Optional[Variant[Pattern[/^(?:!\s)?[\w\-_]+\s(?:src|dst)(?:,src|,dst)?$/], Array[Pattern[/^(?:!\s)?[\w\-_]+\s(?:src|dst)(?:,src|,dst)?$/]]]]', desc: <<-DESC
953952
Matches against the specified ipset list.
954953
Requires ipset kernel module. Will accept a single element or an array.
955954
The value is the name of the denylist, followed by a space, and then

0 commit comments

Comments
 (0)