saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #23241 from techhat/issue23224

Browse source 
Move iptables log options after the jump
This commit is contained in:
Justin Findlay 2015-04-30 19:31:59 -06:00
commit 8de3c83956
1 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
salt/modules/iptables.py
View file

@ -300,6 +300,34 @@ def build_rule(table=None, chain=None, command=None, position='', full=None, fam
after_jump.append('--reject-with {0} '.format(kwargs['reject-with']))
del kwargs['reject-with']
if 'log' in kwargs:
after_jump.append('--log {0} '.format(kwargs['log']))
del kwargs['log']
if 'log-level' in kwargs:
after_jump.append('--log-level {0} '.format(kwargs['log-level']))
del kwargs['log-level']
if 'log-prefix' in kwargs:
after_jump.append('--log-prefix {0} '.format(kwargs['log-prefix']))
del kwargs['log-prefix']
if 'log-tcp-sequence' in kwargs:
after_jump.append('--log-tcp-sequence {0} '.format(kwargs['log-tcp-sequence']))
del kwargs['log-tcp-sequence']
if 'log-tcp-options' in kwargs:
after_jump.append('--log-tcp-options {0} '.format(kwargs['log-tcp-options']))
del kwargs['log-tcp-options']
if 'log-ip-options' in kwargs:
after_jump.append('--log-ip-options {0} '.format(kwargs['log-ip-options']))
del kwargs['log-ip-options']
if 'log-uid' in kwargs:
after_jump.append('--log-uid {0} '.format(kwargs['log-uid']))
del kwargs['log-uid']
for item in kwargs:
if str(kwargs[item]).startswith('!') or str(kwargs[item]).startswith('not'):
kwargs[item] = re.sub(bang_not_pat, '', kwargs[item])