Re-factor the directive message change

- results in much more compact code
- Document change in the config basics doc

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2017-03-18 11:42:53 -07:00
parent ccf9d73c72
commit a79dc194a4
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
2 changed files with 14 additions and 2 deletions

View File

@ -13,9 +13,9 @@
DEFAULTS 2,0 DEFAULTS 2,0
?if @1 !~ /^\d+/ || ! @1 || @1 > 1024 ?if @1 !~ /^\d+/ || ! @1 || @1 > 1024
?error Invalid value for Bricks (@1) ?error Invalid value (@1) for the GlusterFS Bricks argument
?elsif @2 !~ /^[01]$/ ?elsif @2 !~ /^[01]$/
?error Invalid value for IB (@2) ?error Invalid value (@2) for the GlusterFS IB argument
?endif ?endif
#ACTION SOURCE DEST PROTO DPORT #ACTION SOURCE DEST PROTO DPORT

View File

@ -2275,6 +2275,18 @@ SSH(ACCEPT) net:$MYIP $FW
<command>restart</command>, <command>reload</command>, <command>restart</command>, <command>reload</command>,
<command>refresh</command>, or one of the <command>safe</command>-* <command>refresh</command>, or one of the <command>safe</command>-*
commands.</para> commands.</para>
<para>See the VERBOSE_MESSAGES option in <ulink
url="manpages/shorewall.conf.html">shorewall.conf(5)</ulink> for
additional information.</para>
<para>In Shorewall 5.1.4, the behavior of ?ERROR, ?WARNING and ?INFO was
changed when they appear in an action file. Rather than reporting the
action filename and line number, the generated message reports where the
action was invoked. For example, the GlusterFS message above was changed
to:</para>
<programlisting> ERROR: Invalid value (2000) for the GlusterFS Bricks argument /etc/shorewall/rules (line 45)</programlisting>
</section> </section>
<section id="Embedded"> <section id="Embedded">