Correct indentation

Signed-off-by: Tom Eastep <teastep@shorewall.net>
Correct typo in lib.private
2016-10-09 11:13:01 -07:00 · 2016-10-09 10:59:00 -07:00 · 2016-10-03 11:23:51 -07:00 · 2016-10-03 09:51:50 -07:00 · 2016-10-03 09:09:57 -07:00
16 changed files with 54 additions and 52 deletions
--- a/Shorewall/Perl/Shorewall/Providers.pm
+++ b/Shorewall/Perl/Shorewall/Providers.pm
@ -1088,7 +1088,7 @@ CEOF
 	    emit( "setup_${dev}_tc" ) if $tcdevices->{$interface};
 	}

-	emit( qq(    rm -f \${VARDIR}/${physical}_disabled) );
+	emit( qq(rm -f \${VARDIR}/${physical}_disabled) );
 	emit_started_message( '', 2, $pseudo, $table, $number );

 	pop_indent;
--- a/Shorewall/Perl/lib.runtime
+++ b/Shorewall/Perl/lib.runtime
@ -607,7 +607,7 @@ interface_enabled() {
 	status=$(cat ${VARDIR}/${1}.status)
    fi

-    return status
+    return $status
 }

 distribute_load() {
--- a/Shorewall/Samples/Universal/shorewall.conf
+++ b/Shorewall/Samples/Universal/shorewall.conf
@ -128,16 +128,14 @@ ADD_SNAT_ALIASES=No

 ADMINISABSENTMINDED=Yes

-BASIC_FILTERS=No
-
-IGNOREUNKNOWNVARIABLES=No
-
 AUTOCOMMENT=Yes

 AUTOHELPERS=Yes

 AUTOMAKE=Yes

+BASIC_FILTERS=No
+
 BLACKLIST="NEW,INVALID,UNTRACKED"

 CHAIN_SCRIPTS=No
@ -172,6 +170,8 @@ FORWARD_CLEAR_MARK=

 HELPERS=

+IGNOREUNKNOWNVARIABLES=No
+
 IMPLICIT_CONTINUE=No

 INLINE_MATCHES=Yes
--- a/Shorewall/Samples/one-interface/shorewall.conf
+++ b/Shorewall/Samples/one-interface/shorewall.conf
@ -139,16 +139,14 @@ ADD_SNAT_ALIASES=No

 ADMINISABSENTMINDED=Yes

-BASIC_FILTERS=No
-
-IGNOREUNKNOWNVARIABLES=No
-
 AUTOCOMMENT=Yes

 AUTOHELPERS=Yes

 AUTOMAKE=Yes

+BASIC_FILTERS=No
+
 BLACKLIST="NEW,INVALID,UNTRACKED"

 CHAIN_SCRIPTS=No
@ -183,6 +181,8 @@ FORWARD_CLEAR_MARK=

 HELPERS=

+IGNOREUNKNOWNVARIABLES=No
+
 IMPLICIT_CONTINUE=No

 INLINE_MATCHES=Yes
--- a/Shorewall/Samples/three-interfaces/shorewall.conf
+++ b/Shorewall/Samples/three-interfaces/shorewall.conf
@ -136,16 +136,14 @@ ADD_SNAT_ALIASES=No

 ADMINISABSENTMINDED=Yes

-BASIC_FILTERS=No
-
-IGNOREUNKNOWNVARIABLES=No
-
 AUTOCOMMENT=Yes

 AUTOHELPERS=Yes

 AUTOMAKE=Yes

+BASIC_FILTERS=No
+
 BLACKLIST="NEW,INVALID,UNTRACKED"

 CHAIN_SCRIPTS=No
@ -180,6 +178,8 @@ FORWARD_CLEAR_MARK=

 HELPERS=

+IGNOREUNKNOWNVARIABLES=No
+
 IMPLICIT_CONTINUE=No

 INLINE_MATCHES=Yes
--- a/Shorewall/Samples/two-interfaces/shorewall.conf
+++ b/Shorewall/Samples/two-interfaces/shorewall.conf
@ -139,16 +139,14 @@ ADD_SNAT_ALIASES=No

 ADMINISABSENTMINDED=Yes

-BASIC_FILTERS=No
-
-IGNOREUNKNOWNVARIABLES=No
-
 AUTOCOMMENT=Yes

 AUTOHELPERS=Yes

 AUTOMAKE=Yes

+BASIC_FILTERS=No
+
 BLACKLIST="NEW,INVALID,UNTRACKED"

 CHAIN_SCRIPTS=No
@ -183,6 +181,8 @@ FORWARD_CLEAR_MARK=

 HELPERS=

+IGNOREUNKNOWNVARIABLES=No
+
 IMPLICIT_CONTINUE=No

 INLINE_MATCHES=Yes
--- a/Shorewall/configfiles/shorewall.conf
+++ b/Shorewall/configfiles/shorewall.conf
@ -128,16 +128,14 @@ ADD_SNAT_ALIASES=No

 ADMINISABSENTMINDED=Yes

-BASIC_FILTERS=No
-
-IGNOREUNKNOWNVARIABLES=No
-
 AUTOCOMMENT=Yes

 AUTOHELPERS=Yes

 AUTOMAKE=No

+BASIC_FILTERS=No
+
 BLACKLIST="NEW,INVALID,UNTRACKED"

 CHAIN_SCRIPTS=Yes
@ -172,6 +170,8 @@ FORWARD_CLEAR_MARK=

 HELPERS=

+IGNOREUNKNOWNVARIABLES=No
+
 IMPLICIT_CONTINUE=No

 INLINE_MATCHES=No
--- a/Shorewall/manpages/shorewall-mangle.xml
+++ b/Shorewall/manpages/shorewall-mangle.xml
@ -137,7 +137,7 @@
                <replaceable>action</replaceable> must be an action declared
                with the <option>mangle</option> option in <ulink
                url="manpages/shorewall-actions.html">shorewall-actions(5)</ulink>.
-                If the action accepts paramaters, they are specified as a
+                If the action accepts parameters, they are specified as a
                comma-separated list within parentheses following the
                <replaceable>action</replaceable> name.</para>
              </listitem>
--- a/Shorewall/manpages/shorewall.conf.xml
+++ b/Shorewall/manpages/shorewall.conf.xml
@ -774,13 +774,14 @@
        <listitem>
          <para>Added in Shorewall 4.4.7. When set to <emphasis
          role="bold">No</emphasis> or <emphasis role="bold">no</emphasis>,
-          chain-based dynamic blacklisting using the <command>shorewall6
-          drop</command>, <command>shorewall6 reject</command>,
-          <command>shorewall6 logdrop</command> and <command>shorewall6
+          chain-based dynamic blacklisting using <command>shorewall
+          drop</command>, <command>shorewall reject</command>,
+          <command>shorewall logdrop</command> and <command>shorewall
          logreject</command> is disabled. Default is <emphasis
          role="bold">Yes</emphasis>. Beginning with Shorewall 5.0.8,
-          ipset-based dynamic blacklisting is also supported. The name of the
-          set (<replaceable>setname</replaceable>) and the level
+          ipset-based dynamic blacklisting using the <command>shorewall
+          blacklist</command> command is also supported. The name of the set
+          (<replaceable>setname</replaceable>) and the level
          (<replaceable>log_level</replaceable>), if any, at which blacklisted
          traffic is to be logged may also be specified. The default set name
          is SW_DBL4 and the default log level is <option>none</option> (no
--- a/Shorewall6/Samples6/Universal/shorewall6.conf
+++ b/Shorewall6/Samples6/Universal/shorewall6.conf
@ -121,16 +121,14 @@ ACCOUNTING_TABLE=filter

 ADMINISABSENTMINDED=Yes

-BASIC_FILTERS=No
-
-IGNOREUNKNOWNVARIABLES=No
-
 AUTOCOMMENT=Yes

 AUTOHELPERS=Yes

 AUTOMAKE=Yes

+BASIC_FILTERS=No
+
 BLACKLIST="NEW,INVALID,UNTRACKED"

 CHAIN_SCRIPTS=No
@ -159,6 +157,8 @@ FORWARD_CLEAR_MARK=

 HELPERS=

+IGNOREUNKNOWNVARIABLES=No
+
 IMPLICIT_CONTINUE=No

 INLINE_MATCHES=Yes
--- a/Shorewall6/Samples6/one-interface/shorewall6.conf
+++ b/Shorewall6/Samples6/one-interface/shorewall6.conf
@ -122,16 +122,14 @@ ACCOUNTING_TABLE=filter

 ADMINISABSENTMINDED=Yes

-BASIC_FILTERS=No
-
-IGNOREUNKNOWNVARIABLES=No
-
 AUTOCOMMENT=Yes

 AUTOHELPERS=Yes

 AUTOMAKE=Yes

+BASIC_FILTERS=No
+
 BLACKLIST="NEW,INVALID,UNTRACKED"

 CHAIN_SCRIPTS=No
@ -160,6 +158,8 @@ FORWARD_CLEAR_MARK=

 HELPERS=

+IGNOREUNKNOWNVARIABLES=No
+
 IMPLICIT_CONTINUE=No

 INLINE_MATCHES=Yes
--- a/Shorewall6/Samples6/three-interfaces/shorewall6.conf
+++ b/Shorewall6/Samples6/three-interfaces/shorewall6.conf
@ -121,16 +121,14 @@ ACCOUNTING_TABLE=filter

 ADMINISABSENTMINDED=Yes

-BASIC_FILTERS=No
-
-IGNOREUNKNOWNVARIABLES=No
-
 AUTOCOMMENT=Yes

 AUTOHELPERS=Yes

 AUTOMAKE=Yes

+BASIC_FILTERS=No
+
 BLACKLIST="NEW,INVALID,UNTRACKED"

 CHAIN_SCRIPTS=No
@ -159,6 +157,8 @@ FORWARD_CLEAR_MARK=

 HELPERS=

+IGNOREUNKNOWNVARIABLES=No
+
 IMPLICIT_CONTINUE=No

 INLINE_MATCHES=Yes
--- a/Shorewall6/Samples6/two-interfaces/shorewall6.conf
+++ b/Shorewall6/Samples6/two-interfaces/shorewall6.conf
@ -121,16 +121,14 @@ ACCOUNTING_TABLE=filter

 ADMINISABSENTMINDED=Yes

-BASIC_FILTERS=No
-
-IGNOREUNKNOWNVARIABLES=No
-
 AUTOCOMMENT=Yes

 AUTOHELPERS=Yes

 AUTOMAKE=Yes

+BASIC_FILTERS=No
+
 BLACKLIST="NEW,INVALID,UNTRACKED"

 CHAIN_SCRIPTS=No
@ -159,6 +157,8 @@ FORWARD_CLEAR_MARK=

 HELPERS=

+IGNOREUNKNOWNVARIABLES=No
+
 IMPLICIT_CONTINUE=No

 INLINE_MATCHES=Yes
--- a/Shorewall6/configfiles/shorewall6.conf
+++ b/Shorewall6/configfiles/shorewall6.conf
@ -121,16 +121,14 @@ ACCOUNTING_TABLE=filter

 ADMINISABSENTMINDED=Yes

-BASIC_FILTERS=No
-
-IGNOREUNKNOWNVARIABLES=No
-
 AUTOCOMMENT=Yes

 AUTOHELPERS=Yes

 AUTOMAKE=No

+BASIC_FILTERS=No
+
 BLACKLIST="NEW,INVALID,UNTRACKED"

 CHAIN_SCRIPTS=Yes
@ -159,6 +157,8 @@ FORWARD_CLEAR_MARK=Yes

 HELPERS=

+IGNOREUNKNOWNVARIABLES=No
+
 IMPLICIT_CONTINUE=No

 INLINE_MATCHES=No
--- a/Shorewall6/manpages/shorewall6-mangle.xml
+++ b/Shorewall6/manpages/shorewall6-mangle.xml
@ -138,7 +138,7 @@
                <replaceable>action</replaceable> must be an action declared
                with the <option>mangle</option> option in <ulink
                url="manpages6/shorewall6-actions.html">shorewall6-actions(5)</ulink>.
-                If the action accepts paramaters, they are specified as a
+                If the action accepts parameters, they are specified as a
                comma-separated list within parentheses following the
                <replaceable>action</replaceable> name.</para>
              </listitem>
--- a/Shorewall6/manpages/shorewall6.conf.xml
+++ b/Shorewall6/manpages/shorewall6.conf.xml
@ -635,13 +635,14 @@
        <listitem>
          <para>Added in Shorewall 4.4.7. When set to <emphasis
          role="bold">No</emphasis> or <emphasis role="bold">no</emphasis>,
-          chain-based dynamic blacklisting using the <command>shorewall6
+          chain-based dynamic blacklisting using <command>shorewall6
          drop</command>, <command>shorewall6 reject</command>,
          <command>shorewall6 logdrop</command> and <command>shorewall6
          logreject</command> is disabled. Default is <emphasis
          role="bold">Yes</emphasis>. Beginning with Shorewall 5.0.8,
-          ipset-based dynamic blacklisting is also supported. The name of the
-          set (<replaceable>setname</replaceable>) and the level
+          ipset-based dynamic blacklisting using <command>shorewall6
+          blacklist</command> is also supported. The name of the set
+          (<replaceable>setname</replaceable>) and the level
          (<replaceable>log_level</replaceable>), if any, at which blacklisted
          traffic is to be logged may also be specified. The default set name
          is SW_DBL6 and the default log level is <option>none</option> (no
Author	SHA1	Message	Date
Tom Eastep	dce3e740a4	Correct indentation Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-09 11:13:01 -07:00
Tom Eastep	09c528468b	Correct typo in lib.private Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-09 10:59:00 -07:00
Tom Eastep	6b20fb42d4	Change order of options in .conf files. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-03 11:23:51 -07:00
Roberto C. Sánchez	d2cd9b5b71	Fix typos	2016-10-03 09:51:50 -07:00
Tom Eastep	05dc3db3c1	Correct DYNAMIC_BLACKLISTING documentation Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-03 09:09:57 -07:00