Skip to content

Commit fcbfe52

Browse files
authored
Merge pull request #1073 from puppetlabs/revert-1069-add-new-directives
Revert "Add new directives in rules which are currently unparsable by the module"
2 parents ffc0dc4 + 4fe52b2 commit fcbfe52

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

lib/puppet/provider/firewall/iptables.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@
130130
nflog_prefix: '--nflog-prefix',
131131
nflog_range: '--nflog-range',
132132
nflog_threshold: '--nflog-threshold',
133-
on_port: '--on-port',
134-
on_ip: '--on-ip',
135133
outiface: '-o',
136134
pkttype: '-m pkttype --pkt-type',
137135
port: '-m multiport --ports',
@@ -175,8 +173,6 @@
175173
toports: '--to-ports',
176174
tosource: '--to-source',
177175
to: '--to',
178-
transparent: '--transparent',
179-
tproxy_mark: '--tproxy-mark',
180176
uid: '--uid-owner',
181177
u32: ['-m u32 --u32', '--u32'],
182178
physdev_in: '--physdev-in',
@@ -236,7 +232,6 @@
236232
:rsource,
237233
:rttl,
238234
:socket,
239-
:transparent,
240235
:physdev_is_bridged,
241236
:physdev_is_in,
242237
:physdev_is_out,
@@ -362,8 +357,7 @@ def munge_resource_map_from_resource(resource_map_original, compare)
362357
:month_days, :week_days, :date_start, :date_stop, :time_contiguous, :kernel_timezone,
363358
:src_cc, :dst_cc, :hashlimit_upto, :hashlimit_above, :hashlimit_name, :hashlimit_burst,
364359
:hashlimit_mode, :hashlimit_srcmask, :hashlimit_dstmask, :hashlimit_htable_size,
365-
:hashlimit_htable_max, :hashlimit_htable_expire, :hashlimit_htable_gcinterval, :bytecode, :ipvs, :zone, :helper, :cgroup, :rpfilter, :condition, :name, :notrack,
366-
:on_port, :on_ip, :tproxy_mark
360+
:hashlimit_htable_max, :hashlimit_htable_expire, :hashlimit_htable_gcinterval, :bytecode, :ipvs, :zone, :helper, :cgroup, :rpfilter, :condition, :name, :notrack
367361
]
368362

369363
def insert

0 commit comments

Comments
 (0)