Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ncm-shorewall: Fix wrapping and indentation in pan #1769

Merged
merged 1 commit into from
Dec 4, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions ncm-shorewall/src/main/pan/components/shorewall/schema.pan
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,9 @@ type component_shorewall_rules = {
"loglevel" ? string
};

type component_shorewall_shorewall_blacklist = string with
match(SELF, '^(ALL|NEW|ESTABLISHED|RELATED|INVALID|UNTRACKED)$');
type component_shorewall_shorewall_blacklist = string with match(SELF,
'^(ALL|NEW|ESTABLISHED|RELATED|INVALID|UNTRACKED)$'
);

@{shorewall.conf options. only configured options are written to the configfile}
type component_shorewall_shorewall = {
Expand Down Expand Up @@ -296,8 +297,10 @@ type component_shorewall = {
@{tcpri configuration}
"tcpri" ? component_shorewall_tcpri[]
@{masq configuration}
"masq" ? component_shorewall_masq[] with {deprecated(0,
'deprecated in favor of shorewall-snat which was introduced in Shorewall 5.0.14'); true; }
"masq" ? component_shorewall_masq[] with {
deprecated(0, 'deprecated in favor of shorewall-snat which was introduced in Shorewall 5.0.14');
true;
}
@{snat configuration}
"snat" ? component_shorewall_snat[]
@{providers configuration}
Expand Down