diff --git a/Shorewall/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml index 25c6da338..b4412ad52 100644 --- a/Shorewall/manpages/shorewall.conf.xml +++ b/Shorewall/manpages/shorewall.conf.xml @@ -245,8 +245,10 @@ Addresses added by ADD_IP_ALIASES=Yes are deleted and - re-added during shorewall restart. As a consequence, connections - using those addresses may be severed. + re-added during shorewall reload + and shorewall restart. As a + consequence, connections using those addresses may be + severed. @@ -271,8 +273,10 @@ Addresses added by ADD_SNAT_ALIASES=Yes are deleted and - re-added during shorewall restart. As a consequence, connections - using those addresses may be severed. + re-added during shorewall reload + and shorewall restart. As a + consequence, connections using those addresses may be + severed. @@ -360,11 +364,6 @@ comment when a macro is invoked, the behavior is as if the first line of the macro file was "COMMENT <macro name>". The AUTO_COMMENT option has a default value of 'Yes'. - - The setting of the AUTOMAKE option is ignored if the - start or restart command - includes a directory name (e.g., shorewall restart - /etc/shorewall.new). @@ -422,14 +421,21 @@ role="bold">Yes|No] - If set, the behavior of the start and + If set, the behavior of the start, + reload and restart commands are changed; if no files in - /etc/shorewall have been changed since the last successful - start or restart command, then - the compilation step is skipped and the compiled script that - executed the last start or - restart command is used. The default is - AUTOMAKE=No. + CONFIG_PATH (see below) have been changed since the last successful + start, reload or restart + command, then the compilation step is skipped and the compiled + script that executed the last start, reload or restart command + is used. The default is AUTOMAKE=No. + + The setting of the AUTOMAKE option is ignored if the + start, reload or + restart command includes a directory name + (e.g., shorewall restart + /etc/shorewall.new). @@ -688,10 +694,10 @@ associated with the DNS name is subject to change. When DEFER_DNS_RESOLUTION=No, DNS names are converted into IP addresses by the compiler. This has the advantage that when AUTOMAKE=Yes, the - start and restart commands - will succeed even if no DNS server is reachable (assuming that the - configuration hasn't changed since the compiled script was last - generated). + start, reload + and restart commands will succeed even if no DNS + server is reachable (assuming that the configuration hasn't changed + since the compiled script was last generated). @@ -751,7 +757,7 @@ - Restart Shorewall + Reload Shorewall @@ -1241,29 +1247,13 @@ net all DROP infothen the chain name is 'net-all' /var/lib/shorewall/rt_tables (/var/lib/shorewall-lite/rt_tables) before your next stop, refresh, - restore on restart - command. + restore, reload + or restart command. The default is KEEP_RT_TABLES=No. - - LEGACY_FASTSTART={Yes|No} - - - Added in Shorewall 4.4.20. If not specified, the default is - Yes which preserves the legacy behavior of start - -f (the modification times of the files in - /etc/shorewall are compared with that of - /var/lib/shorewall/restore). If set to No, then - the times are compared with that of /var/lib/shorewall/firewall, - which is consistent with the way that restart -f - works. - - - LEGACY_RESTART={Yes|No} @@ -1276,9 +1266,10 @@ net all DROP infothen the chain name is 'net-all' restart (equivalent to stop followed by start). When LEGACY_FASTSTART=Yes, the restart - command performs the same operation as the reload command making it - compatible with earlier releases. If not specified, - LAGACY_RESTART=No is assumed. + command performs the same operation as the reload command making it compatible with + earlier releases. If not specified, LAGACY_RESTART=No is + assumed. @@ -2345,7 +2336,8 @@ INLINE - - - ; -j REJECT not be deleted. Regardless of the setting of RETAIN_ALIASES, addresses added during shorewall start are still deleted at a subsequent shorewall stop or shorewall stop, shorewall reload or shorewall restart. @@ -2538,6 +2530,7 @@ INLINE - - - ; -j REJECT If specified, determines where Shorewall will log the details of each start, reload, restart and refresh command. Logging verbosity is determined by the setting of LOG_VERBOSITY above. diff --git a/Shorewall6/manpages/shorewall6.conf.xml b/Shorewall6/manpages/shorewall6.conf.xml index a37d0265b..f8862edf2 100644 --- a/Shorewall6/manpages/shorewall6.conf.xml +++ b/Shorewall6/manpages/shorewall6.conf.xml @@ -351,19 +351,21 @@ role="bold">Yes|No] - If set, the behavior of the start and - restart commands is changed; if no files in - /etc/shorewall have been - changed since the last successful start or + If set, the behavior of the start, + reload and + restart commands is changed; if no files in the + CONFIG_PATH (see below) have been changed since the last successful + start, reload or restart command, then the compilation step is skipped and the compiled script that executed the last - start or restart command is - used. The default is AUTOMAKE=No. + start, reload or + restart command is used. The default is + AUTOMAKE=No. The setting of the AUTOMAKE option is ignored if the - start or restart command - includes a directory name (e.g., shorewall6 restart + start, reload or + restart command includes a directory name + (e.g., shorewall6 restart /etc/shorewall.new). @@ -621,10 +623,10 @@ associated with the DNS name is subject to change. When DEFER_DNS_RESOLUTION=No, DNS names are converted into IP addresses by the compiler. This has the advantage that when AUTOMAKE=Yes the - start and restart commands - will succeed even if no DNS server is reachable (assuming that the - configuration hasn't changed since the compiled script was last - generated). + start, reload + and restart commands will succeed even if no DNS + server is reachable (assuming that the configuration hasn't changed + since the compiled script was last generated). @@ -1092,29 +1094,13 @@ net all DROP infothen the chain name is 'net-all' /var/lib/shorewall6/rt_tables (/var/lib/shorewall6-lite/rt_tables) before your next stop, refresh, - restore on restart - command. + restore, reload + or restart command. The default is KEEP_RT_TABLES=No. - - LEGACY_FASTSTART={Yes|No} - - - Added in Shorewall6 4.4.20. If not specified, the default is - Yes which preserves the legacy behavior of start - -f (the modification times of the files in - /etc/shorewall6 are compared with that of - /var/lib/shorewall6/restore). If set to No, - then the times are compared with that of - /var/lib/shorewall6/firewall, which is consistent with the way that - restart -f works. - - - LEGACY_RESTART={Yes|No} @@ -2191,6 +2177,7 @@ INLINE - - - ; -j REJECT If specified, determines where Shorewall6 will log the details of each start, reload, restart and refresh command. Logging verbosity is determined by the setting of LOG_VERBOSITY above.