diff --git a/Shorewall/Actions/action.GlusterFS b/Shorewall/Actions/action.GlusterFS index 9e8352593..bee3f1881 100644 --- a/Shorewall/Actions/action.GlusterFS +++ b/Shorewall/Actions/action.GlusterFS @@ -13,9 +13,9 @@ DEFAULTS 2,0 ?if @1 !~ /^\d+/ || ! @1 || @1 > 1024 - ?error Invalid value for Bricks (@1) + ?error Invalid value (@1) for the GlusterFS Bricks argument ?elsif @2 !~ /^[01]$/ - ?error Invalid value for IB (@2) + ?error Invalid value (@2) for the GlusterFS IB argument ?endif #ACTION SOURCE DEST PROTO DPORT diff --git a/docs/configuration_file_basics.xml b/docs/configuration_file_basics.xml index e23fb19c1..ea5755b97 100644 --- a/docs/configuration_file_basics.xml +++ b/docs/configuration_file_basics.xml @@ -2275,6 +2275,18 @@ SSH(ACCEPT) net:$MYIP $FW restart, reload, refresh, or one of the safe-* commands. + + See the VERBOSE_MESSAGES option in shorewall.conf(5) for + additional information. + + 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: + + ERROR: Invalid value (2000) for the GlusterFS Bricks argument /etc/shorewall/rules (line 45)