add ipset support #383
Merged
add ipset support #383
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Can you please rebase this? |
Closed
|
@mhaskel shall we merge it now please ? :) I'm rebasing it 3rd time already. |
| @@ -217,6 +219,8 @@ def self.rule_to_hash(line, table, counter) | |||
| # --tcp-flags takes two values; we cheat by adding " around it | |||
| # so it behaves like --comment | |||
| values = values.gsub(/(!\s+)?--tcp-flags (\S*) (\S*)/, '--tcp-flags "\1\2 \3"') | |||
| # ditto for --match-set | |||
| values = values.sub(/--match-set (\S*) (\S*)/, '--match-set "\1 \2"') | |||
There was a problem hiding this comment.
Since this is possible to be inverted, do we want to add (!\s+)? and "\1\2 \3" to the regex, and add it to https://github.com/puppetlabs/puppetlabs-firewall/blob/master/lib/puppet/provider/firewall/iptables.rb#L318 ?
There was a problem hiding this comment.
Yeah, I think that's a good idea.
|
CLA signed by all contributors. |
|
sorry for the late reply. i resolved all the comments, let me know if there's anything else. |
|
@mhaskel @hunner could you take a look when you have time? |
cegeka-jenkins
pushed a commit
to cegeka/puppet-firewall
that referenced
this pull request
Oct 23, 2017
add ipset support
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a rebased version of #348 and a fix for MODULES-1173.