From: Hunter Haugen <hunter@puppetlabs.com>
Date: Thu, 21 Aug 2014 19:50:01 +0000 (-0700)
Subject: Bugfix stat_prob -> stat_probability
X-Git-Tag: 1.3.0~1^2~19^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a0c7b314310226327d5edfc9226b02179e36931d;p=puppet-modules%2Fpuppetlabs-firewall.git
Bugfix stat_prob -> stat_probability
I also aligned arrows and sorted the resource map
---
diff --git a/lib/puppet/provider/firewall/ip6tables.rb b/lib/puppet/provider/firewall/ip6tables.rb
index a561a7f..2ed90a8 100644
--- a/lib/puppet/provider/firewall/ip6tables.rb
+++ b/lib/puppet/provider/firewall/ip6tables.rb
@@ -48,46 +48,50 @@ Puppet::Type.type(:firewall).provide :ip6tables, :parent => :iptables, :source =
@protocol = "IPv6"
@resource_map = {
- :burst => "--limit-burst",
- :connlimit_above => "-m connlimit --connlimit-above",
- :connlimit_mask => "--connlimit-mask",
- :connmark => "-m connmark --mark",
- :ctstate => "-m conntrack --ctstate",
- :destination => "-d",
- :dport => "-m multiport --dports",
- :gid => "-m owner --gid-owner",
- :icmp => "-m icmp6 --icmpv6-type",
- :iniface => "-i",
- :jump => "-j",
- :hop_limit => "-m hl --hl-eq",
- :limit => "-m limit --limit",
- :log_level => "--log-level",
- :log_prefix => "--log-prefix",
- :name => "-m comment --comment",
- :outiface => "-o",
- :port => '-m multiport --ports',
- :proto => "-p",
- :rdest => "--rdest",
- :reap => "--reap",
- :recent => "-m recent",
- :reject => "--reject-with",
- :rhitcount => "--hitcount",
- :rname => "--name",
- :rseconds => "--seconds",
- :rsource => "--rsource",
- :rttl => "--rttl",
- :source => "-s",
- :state => "-m state --state",
- :sport => "-m multiport --sports",
- :table => "-t",
- :todest => "--to-destination",
- :toports => "--to-ports",
- :tosource => "--to-source",
- :uid => "-m owner --uid-owner",
- :pkttype => "-m pkttype --pkt-type",
- :ishasmorefrags => "-m frag --fragid 0 --fragmore",
- :islastfrag => "-m frag --fragid 0 --fraglast",
- :isfirstfrag => "-m frag --fragid 0 --fragfirst",
+ :burst => "--limit-burst",
+ :connlimit_above => "-m connlimit --connlimit-above",
+ :connlimit_mask => "--connlimit-mask",
+ :connmark => "-m connmark --mark",
+ :ctstate => "-m conntrack --ctstate",
+ :destination => "-d",
+ :dport => "-m multiport --dports",
+ :gid => "-m owner --gid-owner",
+ :hop_limit => "-m hl --hl-eq",
+ :icmp => "-m icmp6 --icmpv6-type",
+ :iniface => "-i",
+ :isfirstfrag => "-m frag --fragid 0 --fragfirst",
+ :ishasmorefrags => "-m frag --fragid 0 --fragmore",
+ :islastfrag => "-m frag --fragid 0 --fraglast",
+ :jump => "-j",
+ :limit => "-m limit --limit",
+ :log_level => "--log-level",
+ :log_prefix => "--log-prefix",
+ :name => "-m comment --comment",
+ :outiface => "-o",
+ :pkttype => "-m pkttype --pkt-type",
+ :port => '-m multiport --ports',
+ :proto => "-p",
+ :rdest => "--rdest",
+ :reap => "--reap",
+ :recent => "-m recent",
+ :reject => "--reject-with",
+ :rhitcount => "--hitcount",
+ :rname => "--name",
+ :rseconds => "--seconds",
+ :rsource => "--rsource",
+ :rttl => "--rttl",
+ :source => "-s",
+ :sport => "-m multiport --sports",
+ :stat_every => '--every',
+ :stat_mode => "-m statistic --mode",
+ :stat_packet => '--packet',
+ :stat_probability => '--probability',
+ :state => "-m state --state",
+ :table => "-t",
+ :todest => "--to-destination",
+ :toports => "--to-ports",
+ :tosource => "--to-source",
+ :uid => "-m owner --uid-owner",
}
# These are known booleans that do not take a value, but we want to munge
diff --git a/lib/puppet/provider/firewall/iptables.rb b/lib/puppet/provider/firewall/iptables.rb
index baf0296..09816a3 100644
--- a/lib/puppet/provider/firewall/iptables.rb
+++ b/lib/puppet/provider/firewall/iptables.rb
@@ -48,59 +48,59 @@ Puppet::Type.type(:firewall).provide :iptables, :parent => Puppet::Provider::Fir
@protocol = "IPv4"
@resource_map = {
- :burst => "--limit-burst",
- :connlimit_above => "-m connlimit --connlimit-above",
- :connlimit_mask => "--connlimit-mask",
- :connmark => "-m connmark --mark",
- :ctstate => "-m conntrack --ctstate",
- :destination => "-d",
- :dst_type => "-m addrtype --dst-type",
- :dst_range => "-m iprange --dst-range",
- :dport => ["-m multiport --dports", "--dport"],
- :gid => "-m owner --gid-owner",
- :icmp => "-m icmp --icmp-type",
- :iniface => "-i",
- :jump => "-j",
- :limit => "-m limit --limit",
- :log_level => "--log-level",
- :log_prefix => "--log-prefix",
- :name => "-m comment --comment",
- :outiface => "-o",
- :port => '-m multiport --ports',
- :proto => "-p",
- :random => "--random",
- :rdest => "--rdest",
- :reap => "--reap",
- :recent => "-m recent",
- :reject => "--reject-with",
- :rhitcount => "--hitcount",
- :rname => "--name",
- :rseconds => "--seconds",
- :rsource => "--rsource",
- :rttl => "--rttl",
- :set_mark => mark_flag,
- :socket => "-m socket",
- :source => "-s",
- :src_type => "-m addrtype --src-type",
- :src_range => "-m iprange --src-range",
- :sport => ["-m multiport --sports", "--sport"],
- :state => "-m state --state",
- :table => "-t",
- :tcp_flags => "-m tcp --tcp-flags",
- :todest => "--to-destination",
- :toports => "--to-ports",
- :tosource => "--to-source",
- :uid => "-m owner --uid-owner",
- :pkttype => "-m pkttype --pkt-type",
- :isfragment => "-f",
- :ipsec_dir => "-m policy --dir",
- :ipsec_policy => "--pol",
- :mask => '--mask',
- :mac_source => ["-m mac --mac-source", "--mac-source"],
- :stat_mode => "-m statistic --mode",
- :stat_every => '--every',
- :stat_packet => '--packet',
- :stat_prob => '--probability',
+ :burst => "--limit-burst",
+ :connlimit_above => "-m connlimit --connlimit-above",
+ :connlimit_mask => "--connlimit-mask",
+ :connmark => "-m connmark --mark",
+ :ctstate => "-m conntrack --ctstate",
+ :destination => "-d",
+ :dport => ["-m multiport --dports", "--dport"],
+ :dst_range => "-m iprange --dst-range",
+ :dst_type => "-m addrtype --dst-type",
+ :gid => "-m owner --gid-owner",
+ :icmp => "-m icmp --icmp-type",
+ :iniface => "-i",
+ :ipsec_dir => "-m policy --dir",
+ :ipsec_policy => "--pol",
+ :isfragment => "-f",
+ :jump => "-j",
+ :limit => "-m limit --limit",
+ :log_level => "--log-level",
+ :log_prefix => "--log-prefix",
+ :mac_source => ["-m mac --mac-source", "--mac-source"],
+ :mask => '--mask',
+ :name => "-m comment --comment",
+ :outiface => "-o",
+ :pkttype => "-m pkttype --pkt-type",
+ :port => '-m multiport --ports',
+ :proto => "-p",
+ :random => "--random",
+ :rdest => "--rdest",
+ :reap => "--reap",
+ :recent => "-m recent",
+ :reject => "--reject-with",
+ :rhitcount => "--hitcount",
+ :rname => "--name",
+ :rseconds => "--seconds",
+ :rsource => "--rsource",
+ :rttl => "--rttl",
+ :set_mark => mark_flag,
+ :socket => "-m socket",
+ :source => "-s",
+ :sport => ["-m multiport --sports", "--sport"],
+ :src_range => "-m iprange --src-range",
+ :src_type => "-m addrtype --src-type",
+ :stat_every => '--every',
+ :stat_mode => "-m statistic --mode",
+ :stat_packet => '--packet',
+ :stat_probability => '--probability',
+ :state => "-m state --state",
+ :table => "-t",
+ :tcp_flags => "-m tcp --tcp-flags",
+ :todest => "--to-destination",
+ :toports => "--to-ports",
+ :tosource => "--to-source",
+ :uid => "-m owner --uid-owner",
}
# These are known booleans that do not take a value, but we want to munge
@@ -149,7 +149,7 @@ Puppet::Type.type(:firewall).provide :iptables, :parent => Puppet::Provider::Fir
# This order can be determined by going through iptables source code or just tweaking and trying manually
@resource_list = [
:table, :source, :destination, :iniface, :outiface, :proto, :isfragment,
- :stat_mode, :stat_every, :stat_packet, :stat_prob,
+ :stat_mode, :stat_every, :stat_packet, :stat_probability,
:src_range, :dst_range, :tcp_flags, :gid, :uid, :mac_source, :sport, :dport, :port,
:dst_type, :src_type, :socket, :pkttype, :name, :ipsec_dir, :ipsec_policy,
:state, :ctstate, :icmp, :limit, :burst, :recent, :rseconds, :reap,