holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Decommit DOCKER=Yes in IPv6.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-02-21 12:03:41 -08:00
parent f4312a38b9
commit 7a9e9ad945
7 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/Config.pm
View File

@ -5861,6 +5861,8 @@ sub get_configuration( $$$$ ) {
default_yes_no 'WORKAROUNDS' , 'Yes';
default_yes_no 'DOCKER' , '';
fatal_error "DOCKER=Yes is not allowed in Shorewall6" if $family == F_IPV6;
require_capability( 'IPTABLES_S', 'DOCKER=Yes', 's' ) if $config{DOCKER};
if ( supplied( $val = $config{RESTART} ) ) {

2
Shorewall6/Samples6/Universal/shorewall6.conf
View File

@ -139,8 +139,6 @@ DEFER_DNS_RESOLUTION=Yes
DELETE_THEN_ADD=Yes
DOCKER=No
DONT_LOAD=
DYNAMIC_BLACKLIST=Yes

2
Shorewall6/Samples6/one-interface/shorewall6.conf
View File

@ -140,8 +140,6 @@ DEFER_DNS_RESOLUTION=Yes
DELETE_THEN_ADD=Yes
DOCKER=No
DONT_LOAD=
DYNAMIC_BLACKLIST=Yes

2
Shorewall6/Samples6/three-interfaces/shorewall6.conf
View File

@ -139,8 +139,6 @@ DEFER_DNS_RESOLUTION=Yes
DELETE_THEN_ADD=Yes
DOCKER=No
DONT_LOAD=
DYNAMIC_BLACKLIST=Yes

2
Shorewall6/Samples6/two-interfaces/shorewall6.conf
View File

@ -139,8 +139,6 @@ DEFER_DNS_RESOLUTION=Yes
DELETE_THEN_ADD=Yes
DOCKER=No
DONT_LOAD=
DYNAMIC_BLACKLIST=Yes

2
Shorewall6/configfiles/shorewall6.conf
View File

@ -139,8 +139,6 @@ DEFER_DNS_RESOLUTION=Yes
DELETE_THEN_ADD=Yes
DOCKER=No
DONT_LOAD=
DYNAMIC_BLACKLIST=Yes

13
Shorewall6/manpages/shorewall6.conf.xml
View File

@ -611,19 +611,6 @@
</listitem>
</varlistentry>
<varlistentry>
<term><emphasis role="bold">DOCKER=</emphasis>[<emphasis
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
<listitem>
<para>Added in Shorewall 5.0.6. When set to Yes, the generated
script will save Docker-generated rules before and restore them
after executing the start, reload and restart commands. If set to No
(the default), the generated script will delete any Docker-generated
rules when executing those commands.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><emphasis
role="bold">DONT_LOAD=</emphasis>[<emphasis>module</emphasis>[,<emphasis>module</emphasis>]...]</term>