diff --git a/Shorewall-lite/shorewall.conf b/Shorewall-lite/shorewall.conf index 95e529543..f7c8ffee3 100644 --- a/Shorewall-lite/shorewall.conf +++ b/Shorewall-lite/shorewall.conf @@ -47,29 +47,20 @@ LOGFILE=/var/log/messages # # LOG FORMAT # -# Shell 'printf' Formatting template for the --log-prefix value in log messages -# generated by Shorewall to identify Shorewall log messages. The supplied -# template is expected to accept either two or three arguments; the first is -# the chain name, the second (optional) is the logging rule number within that -# chain and the third is the ACTION specifying the disposition of the packet -# being logged. You must use the %d formatting type for the rule number; if -# your template does not contain %d then the rule number will not be included. +# Should match the corresponding value in the shorewall.conf file used to +# compile the firewall # # If you want to integrate Shorewall with fireparse, then set LOGFORMAT as: # -# LOGFORMAT="fp=%s:%d a=%s " +# LOGFORMAT="fp=" # # If not specified or specified as empty (LOGFORMAT="") then the value -# "Shorewall:%s:%s:" is assumed. +# "Shorewall:" is assumed. # -# CAUTION: /sbin/shorewall-lite uses the leading part of the LOGFORMAT string (up -# to but not including the first '%') to find log messages in the 'show log', -# 'status' and 'hits' commands. This part should not be omitted (the -# LOGFORMAT should not begin with "%") and the leading part should be -# sufficiently unique for /sbin/shorewall to identify Shorewall messages. +# /sbin/shorewall-lite uses the leading part of the LOGFORMAT string # -LOGFORMAT="Shorewall:%s:%s:" +LOGFORMAT="Shorewall:" ############################################################################### # L O C A T I O N O F F I L E S A N D D I R E C T O R I E S