Remove version from config files

Signed-off-by: Tom Eastep <teastep@shorewall.net>
Fix RESTART
2015-10-12 15:02:50 -07:00 · 2015-10-12 14:08:24 -07:00 · 2015-10-12 13:49:24 -07:00 · 2015-10-12 11:45:58 -07:00 · 2015-10-12 10:55:36 -07:00 · 2015-10-10 13:19:41 -07:00
86 changed files with 184 additions and 143 deletions
--- a/Shorewall-init/shorewall-init.service.214.debian
+++ b/Shorewall-init/shorewall-init.service.214.debian
@@ -2,6 +2,7 @@
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
 #
 #     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
+#     Copyright 2015 Tom Eastep <teastep@shorewall.net>
 #
 [Unit]
 Description=Shorewall firewall (bootup security)
--- a/Shorewall-init/shorewall-init.service.debian
+++ b/Shorewall-init/shorewall-init.service.debian
@@ -2,6 +2,7 @@
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
 #
 #     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
+#     Copyright 2015 Tom Eastep <teastep@shorewall.net>
 #
 [Unit]
 Description=Shorewall firewall (bootup security)
--- a/Shorewall-lite/shorewall-lite.service.debian
+++ b/Shorewall-lite/shorewall-lite.service.debian
@@ -2,6 +2,7 @@
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
 #
 #     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
+#     Copyright 2015 Tom Eastep <teastep@shorewall.net>
 #
 [Unit]
 Description=Shorewall IPv4 firewall (lite)
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -300,7 +300,7 @@ our %renamed = ( AUTO_COMMENT => 'AUTOCOMMENT', BLACKLIST_LOGLEVEL => 'BLACKLIST
 #
 # Config options and global settings that are to be copied to output script
 #
-our @propagateconfig = qw/ DISABLE_IPV6 MODULESDIR MODULE_SUFFIX LOAD_HELPERS_ONLY LOCKFILE SUBSYSLOCK LOG_VERBOSITY/;
+our @propagateconfig = qw/ DISABLE_IPV6 MODULESDIR MODULE_SUFFIX LOAD_HELPERS_ONLY LOCKFILE SUBSYSLOCK LOG_VERBOSITY RESTART/;
 #
 # From parsing the capabilities file or detecting capabilities
 #
@@ -601,11 +601,13 @@ our %validlevels;            # Valid log levels.
 # Deprecated options with their default values
 #
 our %deprecated = (
+		   LEGACY_RESTART => 'no'
 		  );
 #
 # Deprecated options that are eliminated via update
 #
 our %converted = (
+		  LEGACY_RESTART => 1
 		 );
 #
 # Eliminated options
@@ -711,7 +713,7 @@ sub initialize( $;$$) {
 		    TC_SCRIPT               => '',
 		    EXPORT                  => 0,
 		    KLUDGEFREE              => '',
-		    VERSION                 => "4.5.19-Beta1",
+		    VERSION                 => "5.0.1",
 		    CAPVERSION              => 40609 ,
 		    BLACKLIST_LOG_TAG       => '',
 		    RELATED_LOG_TAG         => '',
@@ -858,6 +860,7 @@ sub initialize( $;$$) {
 	  BASIC_FILTERS => undef,
 	  WORKAROUNDS => undef ,
 	  LEGACY_RESTART => undef ,
+	  RESTART => undef ,
 	  #
 	  # Packet Disposition
 	  #
@@ -4832,7 +4835,7 @@ sub update_config_file( $ ) {
    unless ( supplied $config{LOGLIMIT} ) {
 	if ( $config{LOGRATE} || $config{LOGBURST} ) {
 	    my $limit;
-	    
+
 	    if ( supplied $config{LOGRATE} ) {
 		fatal_error"Invalid LOGRATE ($config{LOGRATE})" unless $config{LOGRATE}  =~ /^\d+\/(second|minute)$/;
 		$limit = $config{LOGRATE};
@@ -4863,6 +4866,7 @@ sub update_config_file( $ ) {

    update_default( 'USE_DEFAULT_RT', 'No' );
    update_default( 'EXPORTMODULES',  'No' );
+    update_default( 'RESTART',        'reload' );

    my $fn;

@@ -5564,7 +5568,7 @@ sub get_configuration( $$$$ ) {

 		$limit .= "--$match $1 --hashlimit-burst $5 --hashlimit-name lograte --hashlimit-mode ";
 		$units = $4;
-	    } elsif ( $rate =~ /^[sd]:((\d+)(\/(sec|min|hour|day))?)$/ ) {
+	    } elsif ( $rate =~ /^[sd]:((\d+)(\/(sec|min|second|minute|hour|day))?)$/ ) {
 		fatal_error "Invalid rate ($1)" unless $2;
 		$limit .= "--$match $1 --hashlimit-name lograte --hashlimit-mode ";
 		$units = $4;
@@ -5588,7 +5592,7 @@ sub get_configuration( $$$$ ) {
 	    fatal_error "Invalid rate ($1)" unless $2;
 	    fatal_error "Invalid burst value ($5)" unless $5;
 	    $limit = "-m limit --limit $1 --limit-burst $5 ";
-	} elsif ( $rate =~ /^(\d+)(\/(sec|min|hour|day))?$/ )  {
+	} elsif ( $rate =~ /^(\d+)(\/(sec|min|second|minute|hour|day))?$/ )  {
 	    fatal_error "Invalid rate (${1}${2})" unless $1;
 	    $limit = "-m limit --limit $rate ";
 	} else {
@@ -5759,7 +5763,15 @@ sub get_configuration( $$$$ ) {
    default_yes_no 'INLINE_MATCHES'             , '';
    default_yes_no 'BASIC_FILTERS'              , '';
    default_yes_no 'WORKAROUNDS'                , 'Yes';
-    default_yes_no 'LEGACY_RESTART'             , '';
+
+    if ( supplied( $val = $config{RESTART} ) ) {
+	fatal_error "Invalid value for RESTART ($val)" unless $val =~ /^(restart|reload)$/;
+    } elsif (supplied $config{LEGACY_RESTART} ) {
+	default_yes_no 'LEGACY_RESTART'             , 'Yes';
+	$config{RESTART} = $config{LEGACY_RESTART} ? 'reload' : 'restart';
+    } else {
+	$config{RESTART} = 'reload';
+    }

    require_capability( 'BASIC_EMATCH', 'BASIC_FILTERS=Yes', 's' ) if $config{BASIC_FILTERS};

@@ -6302,7 +6314,7 @@ sub generate_aux_config() {

    emit "#\n# Shorewall auxiliary configuration file created by Shorewall version $globals{VERSION} - $date\n#";

-    for my $option ( qw(VERBOSITY LOGFILE LOGFORMAT ARPTABLES IPTABLES IP6TABLES IP TC IPSET PATH SHOREWALL_SHELL SUBSYSLOCK LOCKFILE RESTOREFILE WORKAROUNDS LEGACY_RESTART) ) {
+    for my $option ( qw(VERBOSITY LOGFILE LOGFORMAT ARPTABLES IPTABLES IP6TABLES IP TC IPSET PATH SHOREWALL_SHELL SUBSYSLOCK LOCKFILE RESTOREFILE WORKAROUNDS RESTART) ) {
 	conditionally_add_option $option;
    }

--- a/Shorewall/Perl/Shorewall/Providers.pm
+++ b/Shorewall/Perl/Shorewall/Providers.pm
@@ -846,12 +846,12 @@ CEOF

 	if ( $hostroute ) {
 	    if ( $family == F_IPV4 ) {
-		emit "run_ip route replace $gateway src $address dev $physical ${mtu}";
-		emit "run_ip route replace $gateway src $address dev $physical ${mtu}table $id $realm";
+		emit qq(run_ip route replace $gateway src $address dev $physical ${mtu});
+		emit qq(run_ip route replace $gateway src $address dev $physical ${mtu}table $id $realm);
 	    } else {
-		emit "qt \$IP -6 route add $gateway src $address dev $physical ${mtu}";
-		emit "qt \$IP -6 route del $gateway src $address dev $physical ${mtu}table $id $realm";
-		emit "run_ip route add $gateway src $address dev $physical ${mtu}table $id $realm";
+		emit qq(qt \$IP -6 route add $gateway src $address dev $physical ${mtu});
+		emit qq(qt \$IP -6 route del $gateway src $address dev $physical ${mtu}table $id $realm);
+		emit qq(run_ip route add $gateway src $address dev $physical ${mtu}table $id $realm);
 	    }
 	}

--- a/Shorewall/Perl/prog.footer
+++ b/Shorewall/Perl/prog.footer
@@ -310,7 +310,7 @@ case "$COMMAND" in
    restart)
 	[ $# -ne 1 ] && usage 2

-	if [ -z "$LEGACY_RESTART" ]; then
+	if [ "$RESTART" = restart ]; then
 	    COMMAND=stop stop_command && COMMAND=start start_command
 	else
 	    COMMAND=reload
--- a/Shorewall/Samples/Universal/shorewall.conf
+++ b/Shorewall/Samples/Universal/shorewall.conf
@@ -176,8 +176,6 @@ KEEP_RT_TABLES=No

 LOAD_HELPERS_ONLY=Yes

-LEGACY_RESTART=Yes
-
 MACLIST_TABLE=filter

 MACLIST_TTL=
@@ -204,6 +202,8 @@ REJECT_ACTION=

 REQUIRE_INTERFACE=Yes

+RESTART=restart
+
 RESTORE_DEFAULT_ROUTE=Yes

 RESTORE_ROUTEMARKS=Yes
--- a/Shorewall/Samples/one-interface/interfaces
+++ b/Shorewall/Samples/one-interface/interfaces
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5.0 - Sample Interfaces File for one-interface configuration.
+# Shorewall - Sample Interfaces File for one-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or
--- a/Shorewall/Samples/one-interface/policy
+++ b/Shorewall/Samples/one-interface/policy
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5.0 - Sample Policy File for one-interface configuration.
+# Shorewall - Sample Policy File for one-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or
--- a/Shorewall/Samples/one-interface/rules
+++ b/Shorewall/Samples/one-interface/rules
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5.0 - Sample Rules File for one-interface configuration.
+# Shorewall - Sample Rules File for one-interface configuration.
 # Copyright (C) 2006-2014 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or
--- a/Shorewall/Samples/one-interface/shorewall.conf
+++ b/Shorewall/Samples/one-interface/shorewall.conf
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Shorewall version 5.0 - Sample shorewall.conf for one-interface
+# Shorewall - Sample shorewall.conf for one-interface
 #                         configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
@@ -187,8 +187,6 @@ KEEP_RT_TABLES=No

 LOAD_HELPERS_ONLY=Yes

-LEGACY_RESTART=Yes
-
 MACLIST_TABLE=filter

 MACLIST_TTL=
@@ -215,6 +213,8 @@ REJECT_ACTION=

 REQUIRE_INTERFACE=No

+RESTART=restart
+
 RESTORE_DEFAULT_ROUTE=Yes

 RESTORE_ROUTEMARKS=Yes
--- a/Shorewall/Samples/one-interface/zones
+++ b/Shorewall/Samples/one-interface/zones
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5.0 - Sample Zones File for one-interface configuration.
+# Shorewall - Sample Zones File for one-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or
--- a/Shorewall/Samples/three-interfaces/interfaces
+++ b/Shorewall/Samples/three-interfaces/interfaces
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5.0 - Sample Interfaces File for three-interface configuration.
+# Shorewall - Sample Interfaces File for three-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or
--- a/Shorewall/Samples/three-interfaces/masq
+++ b/Shorewall/Samples/three-interfaces/masq
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5.0 - Sample Masq file for three-interface configuration.
+# Shorewall - Sample Masq file for three-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or
--- a/Shorewall/Samples/three-interfaces/policy
+++ b/Shorewall/Samples/three-interfaces/policy
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5.0 - Sample Policy File for three-interface configuration.
+# Shorewall - Sample Policy File for three-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or
--- a/Shorewall/Samples/three-interfaces/rules
+++ b/Shorewall/Samples/three-interfaces/rules
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5.0 - Sample Rules File for three-interface configuration.
+# Shorewall - Sample Rules File for three-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or
--- a/Shorewall/Samples/three-interfaces/shorewall.conf
+++ b/Shorewall/Samples/three-interfaces/shorewall.conf
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Shorewall version 5.0 - Sample shorewall.conf for three-interface
+# Shorewall - Sample shorewall.conf for three-interface
 #                         configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
@@ -184,8 +184,6 @@ KEEP_RT_TABLES=No

 LOAD_HELPERS_ONLY=Yes

-LEGACY_RESTART=Yes
-
 MACLIST_TABLE=filter

 MACLIST_TTL=
@@ -212,6 +210,8 @@ REJECT_ACTION=

 REQUIRE_INTERFACE=No

+RESTART=restart
+
 RESTORE_DEFAULT_ROUTE=Yes

 RESTORE_ROUTEMARKS=Yes
--- a/Shorewall/Samples/three-interfaces/stoppedrules
+++ b/Shorewall/Samples/three-interfaces/stoppedrules
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5.0 - Sample Stoppedrules File for three-interface configuration.
+# Shorewall - Sample Stoppedrules File for three-interface configuration.
 # Copyright (C) 2012-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or
--- a/Shorewall/Samples/three-interfaces/zones
+++ b/Shorewall/Samples/three-interfaces/zones
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5.0 - Sample Zones File for three-interface configuration.
+# Shorewall - Sample Zones File for three-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or
--- a/Shorewall/Samples/two-interfaces/interfaces
+++ b/Shorewall/Samples/two-interfaces/interfaces
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5.0 - Sample Interfaces File for two-interface configuration.
+# Shorewall - Sample Interfaces File for two-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or
--- a/Shorewall/Samples/two-interfaces/masq
+++ b/Shorewall/Samples/two-interfaces/masq
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5.0 - Sample Masq file for two-interface configuration.
+# Shorewall - Sample Masq file for two-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or
--- a/Shorewall/Samples/two-interfaces/policy
+++ b/Shorewall/Samples/two-interfaces/policy
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5.0 - Sample Policy File for two-interface configuration.
+# Shorewall - Sample Policy File for two-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or
--- a/Shorewall/Samples/two-interfaces/rules
+++ b/Shorewall/Samples/two-interfaces/rules
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5.0 - Sample Rules File for two-interface configuration.
+# Shorewall - Sample Rules File for two-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or
--- a/Shorewall/Samples/two-interfaces/shorewall.conf
+++ b/Shorewall/Samples/two-interfaces/shorewall.conf
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Shorewall version 5.0 - Sample shorewall.conf for two-interface
+# Shorewall - Sample shorewall.conf for two-interface
 #                         configuration.
 # Copyright (C) 2006-2014 by the Shorewall Team
 #
@@ -187,8 +187,6 @@ KEEP_RT_TABLES=No

 LOAD_HELPERS_ONLY=Yes

-LEGACY_RESTART=Yes
-
 MACLIST_TABLE=filter

 MACLIST_TTL=
@@ -215,6 +213,8 @@ REJECT_ACTION=

 REQUIRE_INTERFACE=No

+RESTART=restart
+
 RESTORE_DEFAULT_ROUTE=Yes

 RESTORE_ROUTEMARKS=Yes
--- a/Shorewall/Samples/two-interfaces/stoppedrules
+++ b/Shorewall/Samples/two-interfaces/stoppedrules
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5.0 - Sample Stoppedrules File for two-interface configuration.
+# Shorewall - Sample Stoppedrules File for two-interface configuration.
 # Copyright (C) 2012-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or
--- a/Shorewall/Samples/two-interfaces/zones
+++ b/Shorewall/Samples/two-interfaces/zones
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5.0 - Sample Zones File for two-interface configuration.
+# Shorewall - Sample Zones File for two-interface configuration.
 # Copyright (C) 2006-2014 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or
--- a/Shorewall/configfiles/accounting
+++ b/Shorewall/configfiles/accounting
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Accounting File
+# Shorewall - Accounting File
 #
 # For information about entries in this file, type "man shorewall-accounting"
 #
--- a/Shorewall/configfiles/actions
+++ b/Shorewall/configfiles/actions
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Actions File
+# Shorewall - Actions File
 #
 # /etc/shorewall/actions
 #
--- a/Shorewall/configfiles/arprules
+++ b/Shorewall/configfiles/arprules
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - arprules File
+# Shorewall - arprules File
 #
 # For information about entries in this file, type "man shorewall-arprules"
 #
--- a/Shorewall/configfiles/blrules
+++ b/Shorewall/configfiles/blrules
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Blacklist Rules File
+# Shorewall - Blacklist Rules File
 #
 # For information about entries in this file, type "man shorewall-blrules"
 #
--- a/Shorewall/configfiles/clear
+++ b/Shorewall/configfiles/clear
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - clear File
+# Shorewall - clear File
 #
 # /etc/shorewall/clear
 #
--- a/Shorewall/configfiles/conntrack
+++ b/Shorewall/configfiles/conntrack
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - conntrack File
+# Shorewall - conntrack File
 #
 # For information about entries in this file, type "man shorewall-conntrack"
 #
--- a/Shorewall/configfiles/ecn
+++ b/Shorewall/configfiles/ecn
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Ecn File
+# Shorewall - Ecn File
 #
 # For information about entries in this file, type "man shorewall-ecn"
 #
--- a/Shorewall/configfiles/findgw
+++ b/Shorewall/configfiles/findgw
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Findgw File
+# Shorewall - Findgw File
 #
 # /etc/shorewall/findgw
 #
--- a/Shorewall/configfiles/hosts
+++ b/Shorewall/configfiles/hosts
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Hosts file
+# Shorewall - Hosts file
 #
 # For information about entries in this file, type "man shorewall-hosts"
 #
--- a/Shorewall/configfiles/init
+++ b/Shorewall/configfiles/init
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Init File
+# Shorewall - Init File
 #
 # /etc/shorewall/init
 #
--- a/Shorewall/configfiles/initdone
+++ b/Shorewall/configfiles/initdone
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Initdone File
+# Shorewall - Initdone File
 #
 # /etc/shorewall/initdone
 #
--- a/Shorewall/configfiles/interfaces
+++ b/Shorewall/configfiles/interfaces
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Interfaces File
+# Shorewall - Interfaces File
 #
 # For information about entries in this file, type "man shorewall-interfaces"
 #
--- a/Shorewall/configfiles/isusable
+++ b/Shorewall/configfiles/isusable
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - isusable File
+# Shorewall - isusable File
 #
 # /etc/shorewall/isusable
 #
--- a/Shorewall/configfiles/lib.private
+++ b/Shorewall/configfiles/lib.private
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - lib.private File
+# Shorewall - lib.private File
 #
 # /etc/shorewall/lib.private
 #
--- a/Shorewall/configfiles/maclist
+++ b/Shorewall/configfiles/maclist
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Maclist file
+# Shorewall - Maclist file
 #
 # For information about entries in this file, type "man shorewall-maclist"
 #
--- a/Shorewall/configfiles/mangle
+++ b/Shorewall/configfiles/mangle
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Mangle File
+# Shorewall - Mangle File
 #
 # For information about entries in this file, type "man shorewall-mangle"
 #
--- a/Shorewall/configfiles/masq
+++ b/Shorewall/configfiles/masq
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Masq file
+# Shorewall - Masq file
 #
 # For information about entries in this file, type "man shorewall-masq"
 #
--- a/Shorewall/configfiles/nat
+++ b/Shorewall/configfiles/nat
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Nat File
+# Shorewall - Nat File
 #
 # For information about entries in this file, type "man shorewall-nat"
 #
--- a/Shorewall/configfiles/netmap
+++ b/Shorewall/configfiles/netmap
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5	 - Netmap File
+# Shorewall	 - Netmap File
 #
 # For information about entries in this file, type "man shorewall-netmap"
 #
--- a/Shorewall/configfiles/params
+++ b/Shorewall/configfiles/params
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Params File
+# Shorewall - Params File
 #
 # /etc/shorewall/params
 #
--- a/Shorewall/configfiles/policy
+++ b/Shorewall/configfiles/policy
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Policy File
+# Shorewall - Policy File
 #
 # For information about entries in this file, type "man shorewall-policy"
 #
--- a/Shorewall/configfiles/providers
+++ b/Shorewall/configfiles/providers
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Providers File
+# Shorewall - Providers File
 #
 # For information about entries in this file, type "man shorewall-providers"
 #
--- a/Shorewall/configfiles/proxyarp
+++ b/Shorewall/configfiles/proxyarp
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Proxyarp File
+# Shorewall - Proxyarp File
 #
 # For information about entries in this file, type "man shorewall-proxyarp"
 #
--- a/Shorewall/configfiles/refresh
+++ b/Shorewall/configfiles/refresh
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - refresh File
+# Shorewall - refresh File
 #
 # /etc/shorewall/refresh
 #
--- a/Shorewall/configfiles/refreshed
+++ b/Shorewall/configfiles/refreshed
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - refreshed File
+# Shorewall - refreshed File
 #
 # /etc/shorewall/refreshed
 #
--- a/Shorewall/configfiles/restored
+++ b/Shorewall/configfiles/restored
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Restored File
+# Shorewall - Restored File
 #
 # /etc/shorewall/restored
 #
--- a/Shorewall/configfiles/routes
+++ b/Shorewall/configfiles/routes
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - routes File
+# Shorewall - routes File
 #
 # For information about entries in this file, type "man shorewall-routes"
 #
--- a/Shorewall/configfiles/routestopped
+++ b/Shorewall/configfiles/routestopped
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Routestopped File
+# Shorewall - Routestopped File
 #
 # This file is deprecated in favor of the stoppedrules file
 #
--- a/Shorewall/configfiles/rtrules
+++ b/Shorewall/configfiles/rtrules
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - route rules File
+# Shorewall - route rules File
 #
 # For information about entries in this file, type "man shorewall-rtrules"
 #
--- a/Shorewall/configfiles/rules
+++ b/Shorewall/configfiles/rules
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Rules File
+# Shorewall - Rules File
 #
 # For information on the settings in this file, type "man shorewall-rules"
 #
--- a/Shorewall/configfiles/scfilter
+++ b/Shorewall/configfiles/scfilter
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Show Connections Filter
+# Shorewall - Show Connections Filter
 #
 # /etc/shorewall/scfilter
 #
--- a/Shorewall/configfiles/secmarks
+++ b/Shorewall/configfiles/secmarks
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Secmarks File
+# Shorewall - Secmarks File
 #
 # For information about entries in this file, type "man shorewall-secmarks"
 #
--- a/Shorewall/configfiles/shorewall.conf
+++ b/Shorewall/configfiles/shorewall.conf
@@ -174,8 +174,6 @@ IP_FORWARDING=On

 KEEP_RT_TABLES=No

-LEGACY_RESTART=Yes
-
 LOAD_HELPERS_ONLY=Yes

 MACLIST_TABLE=filter
@@ -204,6 +202,8 @@ REJECT_ACTION=

 REQUIRE_INTERFACE=No

+RESTART=restart
+
 RESTORE_DEFAULT_ROUTE=Yes

 RESTORE_ROUTEMARKS=Yes
--- a/Shorewall/configfiles/start
+++ b/Shorewall/configfiles/start
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Start File
+# Shorewall - Start File
 #
 # /etc/shorewall/start
 #
--- a/Shorewall/configfiles/started
+++ b/Shorewall/configfiles/started
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Started File
+# Shorewall - Started File
 #
 # /etc/shorewall/started
 #
--- a/Shorewall/configfiles/stop
+++ b/Shorewall/configfiles/stop
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Stop File
+# Shorewall - Stop File
 #
 # /etc/shorewall/stop
 #
--- a/Shorewall/configfiles/stopped
+++ b/Shorewall/configfiles/stopped
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Stopped File
+# Shorewall - Stopped File
 #
 # /etc/shorewall/stopped
 #
--- a/Shorewall/configfiles/stoppedrules
+++ b/Shorewall/configfiles/stoppedrules
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Stopped Rules File
+# Shorewall - Stopped Rules File
 #
 # For information about entries in this file, type "man shorewall-stoppedrules"
 #
--- a/Shorewall/configfiles/tcclasses
+++ b/Shorewall/configfiles/tcclasses
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Tcclasses File
+# Shorewall - Tcclasses File
 #
 # For information about entries in this file, type "man shorewall-tcclasses"
 #
--- a/Shorewall/configfiles/tcclear
+++ b/Shorewall/configfiles/tcclear
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - tcclear File
+# Shorewall - tcclear File
 #
 # /etc/shorewall/tcclear
 #
--- a/Shorewall/configfiles/tcdevices
+++ b/Shorewall/configfiles/tcdevices
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Tcdevices File
+# Shorewall - Tcdevices File
 #
 # For information about entries in this file, type "man shorewall-tcdevices"
 #
--- a/Shorewall/configfiles/tcfilters
+++ b/Shorewall/configfiles/tcfilters
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Tcfilters File
+# Shorewall - Tcfilters File
 #
 # For information about entries in this file, type "man shorewall-tcfilters"
 #
--- a/Shorewall/configfiles/tcinterfaces
+++ b/Shorewall/configfiles/tcinterfaces
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Tcinterfaces File
+# Shorewall - Tcinterfaces File
 #
 # For information about entries in this file, type "man shorewall-tcinterfaces"
 #
--- a/Shorewall/configfiles/tcpri
+++ b/Shorewall/configfiles/tcpri
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Tcpri File
+# Shorewall - Tcpri File
 #
 # For information about entries in this file, type "man shorewall-tcpri"
 #
--- a/Shorewall/configfiles/tunnels
+++ b/Shorewall/configfiles/tunnels
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Tunnels File
+# Shorewall - Tunnels File
 #
 # For information about entries in this file, type "man shorewall-tunnels"
 #
--- a/Shorewall/configfiles/zones
+++ b/Shorewall/configfiles/zones
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Zones File
+# Shorewall - Zones File
 #
 # For information about this file, type "man shorewall-zones"
 #
--- a/Shorewall/manpages/shorewall.conf.xml
+++ b/Shorewall/manpages/shorewall.conf.xml
@@ -89,7 +89,7 @@
    colon (":") and a <firstterm>log tag</firstterm>. The log tag normally
    follows the packet disposition in Shorewall-generated Netfilter log
    messages, separated from the disposition by a colon (e.g, "DROP:mytag").
-    See LOGTAGONLY below for additional information. </para>
+    See LOGTAGONLY below for additional information.</para>

    <para>Beginning with Shorewall 4.4.22, LOGMARK is also a valid level which
    logs the packet's mark value along with the other usual information. The
@@ -1146,25 +1146,6 @@ net     all  DROP   info</programlisting>then the chain name is 'net-all'
        </listitem>
      </varlistentry>

-      <varlistentry>
-        <term><emphasis role="bold">LEGACY_RESTART=</emphasis>{<emphasis
-        role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
-
-        <listitem>
-          <para>Added in Shorewall 5.0.0. In that release, the <emphasis
-          role="bold">reload</emphasis> command was redefined to do what
-          <emphasis role="bold">restart</emphasis> had done in earlier
-          releases and <emphasis role="bold">restart</emphasis> became a true
-          restart (equivalent to <emphasis role="bold">stop</emphasis>
-          followed by <emphasis role="bold">start</emphasis>). When
-          LEGACY_FASTSTART=Yes, the <emphasis role="bold">restart</emphasis>
-          command performs the same operation as the <emphasis
-          role="bold">reload</emphasis> command making it compatible with
-          earlier releases. If not specified, LAGACY_RESTART=No is
-          assumed.</para>
-        </listitem>
-      </varlistentry>
-
      <varlistentry>
        <term><emphasis role="bold">LOAD_HELPERS_ONLY=</emphasis>{<emphasis
        role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
@@ -2169,6 +2150,27 @@ INLINE          -       -       -       ; -j REJECT
        </listitem>
      </varlistentry>

+      <varlistentry>
+        <term><emphasis role="bold">RESTART=</emphasis>[<emphasis
+        role="bold">restart</emphasis>|<emphasis
+        role="bold">reload</emphasis>]</term>
+
+        <listitem>
+          <para>Added in Shorewall 5.0.1 to replace LEGACY_RESTART which was
+          added in Shorewall 5.0.0. In that release, the <emphasis
+          role="bold">reload</emphasis> command was redefined to do what
+          <emphasis role="bold">restart</emphasis> had done in earlier
+          releases and <emphasis role="bold">restart</emphasis> became a true
+          restart (equivalent to <emphasis role="bold">stop</emphasis>
+          followed by <emphasis role="bold">start</emphasis>). When
+          RESTART=reload, the <emphasis role="bold">restart</emphasis> command
+          performs the same operation as the <emphasis
+          role="bold">reload</emphasis> command making it compatible with
+          earlier releases. If not specified, RESTART=reload is
+          assumed.</para>
+        </listitem>
+      </varlistentry>
+
      <varlistentry>
        <term><emphasis
        role="bold">RESTORE_DEFAULT_ROUTE=</emphasis>[<emphasis
@@ -2479,7 +2481,8 @@ INLINE          -       -       -       ; -j REJECT
        role="bold">Yes</emphasis>|<emphasis
        role="bold">No</emphasis>|<emphasis
        role="bold">Internal</emphasis>|<emphasis
-        role="bold">Simple</emphasis>|Shared]</term>
+        role="bold">Simple</emphasis>|<emphasis
+        role="bold">Shared</emphasis>]</term>

        <listitem>
          <para>If you say <emphasis role="bold">Yes</emphasis> or <emphasis
--- a/Shorewall/shorewall.service.debian
+++ b/Shorewall/shorewall.service.debian
@@ -2,6 +2,7 @@
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
 #
 #     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
+#     Copyright 2015 Tom Eastep <teastep@shorewall.net>
 #
 [Unit]
 Description=Shorewall IPv4 firewall
--- a/Shorewall6/Samples6/Universal/shorewall6.conf
+++ b/Shorewall6/Samples6/Universal/shorewall6.conf
@@ -163,8 +163,6 @@ IP_FORWARDING=Off

 KEEP_RT_TABLES=Yes

-LEGACY_RESTART=Yes
-
 LOAD_HELPERS_ONLY=Yes

 MACLIST_TABLE=filter
@@ -187,6 +185,8 @@ REJECT_ACTION=

 REQUIRE_INTERFACE=Yes

+RESTART=restart
+
 RESTORE_ROUTEMARKS=Yes

 SAVE_IPSETS=No
--- a/Shorewall6/Samples6/one-interface/shorewall6.conf
+++ b/Shorewall6/Samples6/one-interface/shorewall6.conf
@@ -164,8 +164,6 @@ IP_FORWARDING=Off

 KEEP_RT_TABLES=Yes

-LEGACY_RESTART=Yes
-
 LOAD_HELPERS_ONLY=Yes

 MACLIST_TABLE=filter
@@ -188,6 +186,8 @@ REJECT_ACTION=

 REQUIRE_INTERFACE=No

+RESTART=restart
+
 RESTORE_ROUTEMARKS=Yes

 SAVE_IPSETS=No
--- a/Shorewall6/Samples6/three-interfaces/shorewall6.conf
+++ b/Shorewall6/Samples6/three-interfaces/shorewall6.conf
@@ -163,8 +163,6 @@ IP_FORWARDING=On

 KEEP_RT_TABLES=Yes

-LEGACY_RESTART=Yes
-
 LOAD_HELPERS_ONLY=Yes

 MACLIST_TABLE=filter
@@ -187,6 +185,8 @@ REJECT_ACTION=

 REQUIRE_INTERFACE=No

+RESTART=restart
+
 RESTORE_ROUTEMARKS=Yes

 SAVE_IPSETS=No
--- a/Shorewall6/Samples6/two-interfaces/shorewall6.conf
+++ b/Shorewall6/Samples6/two-interfaces/shorewall6.conf
@@ -163,8 +163,6 @@ IP_FORWARDING=On

 KEEP_RT_TABLES=Yes

-LEGACY_RESTART=Yes
-
 LOAD_HELPERS_ONLY=Yes

 MACLIST_TABLE=filter
@@ -187,6 +185,8 @@ REJECT_ACTION=

 REQUIRE_INTERFACE=No

+RESTART=restart
+
 RESTORE_ROUTEMARKS=Yes

 SAVE_IPSETS=No
--- a/Shorewall6/configfiles/conntrack
+++ b/Shorewall6/configfiles/conntrack
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - conntrack File
+# Shorewall - conntrack File
 #
 # For information about entries in this file, type "man shorewal6-conntrack"
 #
--- a/Shorewall6/configfiles/findgw
+++ b/Shorewall6/configfiles/findgw
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Findgw File
+# Shorewall - Findgw File
 #
 # /etc/shorewall6/findgw
 #
--- a/Shorewall6/configfiles/proxyndp
+++ b/Shorewall6/configfiles/proxyndp
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Proxyndp File
+# Shorewall - Proxyndp File
 #
 # For information about entries in this file, type "man shorewall6-proxyndp"
 #
--- a/Shorewall6/configfiles/scfilter
+++ b/Shorewall6/configfiles/scfilter
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Show Connections Filter
+# Shorewall - Show Connections Filter
 #
 # /etc/shorewall/scfilter
 #
--- a/Shorewall6/configfiles/shorewall6.conf
+++ b/Shorewall6/configfiles/shorewall6.conf
@@ -163,8 +163,6 @@ IP_FORWARDING=Off

 KEEP_RT_TABLES=Yes

-LEGACY_RESTART=Yes
-
 LOAD_HELPERS_ONLY=Yes

 MACLIST_TABLE=filter
@@ -187,6 +185,8 @@ REJECT_ACTION=

 REQUIRE_INTERFACE=No

+RESTART=restart
+
 RESTORE_ROUTEMARKS=Yes

 SAVE_IPSETS=No
--- a/Shorewall6/manpages/shorewall6.conf.xml
+++ b/Shorewall6/manpages/shorewall6.conf.xml
@@ -1010,24 +1010,6 @@ net     all  DROP   info</programlisting>then the chain name is 'net-all'
        </listitem>
      </varlistentry>

-      <varlistentry>
-        <term><emphasis role="bold">LEGACY_RESTART=</emphasis>{<emphasis
-        role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
-
-        <listitem>
-          <para>Added in Shorewall 5.0.0. In that release, the <emphasis
-          role="bold">reload</emphasis> command was redefined to do what
-          <emphasis role="bold">restart</emphasis> had done in earlier
-          releases and <emphasis role="bold">restart</emphasis> became a true
-          restart (equivalent to <emphasis role="bold">stop</emphasis>
-          followed by <emphasis role="bold">start</emphasis>). When
-          LEGACY_FASTSTART=Yes, the <emphasis role="bold">restart</emphasis>
-          command performs the same operation as the reload command making it
-          compatible with earlier releases. If not specified,
-          LAGACY_RESTART=No is assumed.</para>
-        </listitem>
-      </varlistentry>
-
      <varlistentry>
        <term><emphasis role="bold">LOAD_HELPERS_ONLY=</emphasis>{<emphasis
        role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
@@ -1924,6 +1906,27 @@ INLINE          -       -       -       ; -j REJECT
        </listitem>
      </varlistentry>

+      <varlistentry>
+        <term><emphasis role="bold">RESTART=</emphasis>[<emphasis
+        role="bold">restart</emphasis>|<emphasis
+        role="bold">reload</emphasis>]</term>
+
+        <listitem>
+          <para>Added in Shorewall 5.0.1 to replace LEGACY_RESTART which was
+          added in Shorewall 5.0.0. In that release, the <emphasis
+          role="bold">reload</emphasis> command was redefined to do what
+          <emphasis role="bold">restart</emphasis> had done in earlier
+          releases and <emphasis role="bold">restart</emphasis> became a true
+          restart (equivalent to <emphasis role="bold">stop</emphasis>
+          followed by <emphasis role="bold">start</emphasis>). When
+          RESTART=reload, the <emphasis role="bold">restart</emphasis> command
+          performs the same operation as the <emphasis
+          role="bold">reload</emphasis> command making it compatible with
+          earlier releases. If not specified, RESTART=reload is
+          assumed.</para>
+        </listitem>
+      </varlistentry>
+
      <varlistentry>
        <term><emphasis role="bold">RESTORE_ROUTEMARKS=</emphasis>[<emphasis
        role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
@@ -2143,7 +2146,9 @@ INLINE          -       -       -       ; -j REJECT
        <term><emphasis role="bold">TC_ENABLED=</emphasis>[<emphasis
        role="bold">Yes</emphasis>|<emphasis
        role="bold">No</emphasis>|<emphasis
-        role="bold">Internal|Shared</emphasis>]</term>
+        role="bold">Internal</emphasis>|<emphasis
+        role="bold">Simple</emphasis>|<emphasis
+        role="bold">Shared</emphasis>]</term>

        <listitem>
          <para>If you say <emphasis role="bold">Yes</emphasis> or <emphasis
@@ -2160,6 +2165,13 @@ INLINE          -       -       -       ; -j REJECT
          empty then Shorewall6 will use its builtin traffic shaper
          (tc4shorewall6 written by Arne Bernin.</para>

+          <para>If you set TC_ENABLED=Simple (Shorewall 4.4.6 and later),
+          simple traffic shaping using <ulink
+          url="/manpages/shorewall-tcinterfaces.html">shorewall-tcinterfaces</ulink>(5)
+          and <ulink
+          url="/manpages/shorewall-tcpri.html">shorewall-tcpri</ulink>(5) is
+          enabled.</para>
+
          <para>Beginning with Shorewall 4.4.15, if you set TC_ENABLED=Shared
          or shared, then you should create symbolic links from your
          Shorewall6 configuration directory (normally
--- a/Shorewall6/shorewall6.service.debian
+++ b/Shorewall6/shorewall6.service.debian
@@ -2,6 +2,7 @@
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
 #
 #     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
+#     Copyright 2015 Tom Eastep <teastep@shorewall.net>
 #
 [Unit]
 Description=Shorewall IPv6 firewall
--- a/docs/Shorewall-5.xml
+++ b/docs/Shorewall-5.xml
@@ -338,9 +338,18 @@

      <para>For those that can't get used to the idea of using
      <command>reload</command> in place of <command>restart</command>, a
-      LEGACY_RESTART option has been added to shorewall[6].conf. The option
-      defaults to No but if set to Yes, then the <command>restart</command>
+      RESTART option has been added to shorewall[6].conf. The option defaults
+      to 'restart' but if set to 'reload', then the <command>restart</command>
      command does what it did in earlier releases.</para>
+
+      <note>
+        <para>Beginning with Shorewall 5.0.1 and Shorewall 4.6.13.2, the
+        update command will set RESTART=reload to maintain compatibility with
+        earlier releases. Shorewall 5.0.0 created the setting
+        LEGACY_RESTART=No which was equivalent to RESTART=restart. Under
+        Shorewall 5.0.1 and later, update will convert LEGACY_RESTART to the
+        equivalent RESTART setting.</para>
+      </note>
    </section>
  </section>
Author	SHA1	Message	Date
Tom Eastep	a8e4671668	Remove version from config files Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-12 15:02:50 -07:00
Tom Eastep	7388ff5154	Fix RESTART Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-12 14:08:24 -07:00
Tom Eastep	0dbe756e93	Manpage and Shorewall-5 changes for RESTART Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-12 13:49:24 -07:00
Tom Eastep	72d4637c22	Replace LEGACY_RESTART with RESTART Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-12 11:45:58 -07:00
Tom Eastep	bb538a7c10	Merge branch 'master' into 5.0.0 Conflicts: Shorewall-core/lib.common Shorewall-core/shorewallrc.debian.systemd Shorewall-lite/shorewall-lite.service.debian Shorewall/Perl/Shorewall/Chains.pm Shorewall/Perl/Shorewall/Compiler.pm Shorewall/Perl/Shorewall/Config.pm Shorewall/Perl/Shorewall/Misc.pm Shorewall/Perl/Shorewall/Raw.pm Shorewall/Perl/Shorewall/Tc.pm Shorewall/Perl/compiler.pl Shorewall/Perl/prog.footer Shorewall/lib.cli-std Shorewall/manpages/shorewall-mangle.xml Shorewall/manpages/shorewall.conf.xml Shorewall/manpages/shorewall.xml Shorewall/shorewall.service.debian Shorewall6-lite/shorewall6-lite.service.debian Shorewall6/manpages/shorewall6-mangle.xml Shorewall6/manpages/shorewall6.conf.xml Shorewall6/manpages/shorewall6.xml Shorewall6/shorewall6.service.debian docs/MultiISP.xml docs/Shorewall_Squid_Usage.xml	2015-10-12 10:55:36 -07:00
Tom Eastep	1db3bfb53e	Manpage updates Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-10 13:19:41 -07:00
Tom Eastep	85e44c70eb	Add the Meta-connection to Tinc - Both the macro and the tunnel type are updated Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-17 09:17:35 -07:00
Tom Eastep	03d99de8d5	Correct handling of reset Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-11 15:02:32 -07:00
Tom Eastep	426636458c	Correct shorewall6 mangle man page - Replace 'TTL' by 'HL' Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-08 12:25:59 -07:00
Tom Eastep	0aa5cb5086	Allow non-experts to use the user bits in the fw mark Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-07 11:35:47 -07:00
Tom Eastep	eddd58d459	Move a line of code Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-06 10:33:09 -07:00
Tom Eastep	1bf13e5fda	Provide default for SHOREWALL_SHELL Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-06 10:29:36 -07:00
Tom Eastep	682a449e7b	Correct more Mangle examples Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-02 13:08:05 -07:00
Tom Eastep	9e98d30c92	Correct handling of log levels with default actions Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-02 08:55:18 -07:00
Tom Eastep	582755edf4	Unconditionally get inline matches Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-02 08:03:22 -07:00
Tom Eastep	dea1f853ea	Correct progress messages Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-01 12:42:01 -07:00
Tom Eastep	e15a6f452e	Cosmetic changes to first_entry() calls Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-31 10:54:30 -07:00
Tom Eastep	656eaabce9	Correct a typo Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-31 09:39:40 -07:00
Tom Eastep	f42dc6def1	Uniform mechanism for inserting conversion comments Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-30 15:35:05 -07:00
Tom Eastep	6e303aef69	Fix $convert/$tcrules mess Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-29 18:52:11 -07:00
Tom Eastep	ab260dc5b1	Place a header in a created mangle file during update -t Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-29 12:52:21 -07:00
Tom Eastep	55ab498291	Don't enforce FASTACCEPT/BLACKLISTNEWONLY on convert Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-29 12:51:52 -07:00
Tom Eastep	10cda4cee7	Update man pages for 'minute' and 'second' in LOGLIMIT specifications Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-27 15:49:59 -07:00
Tom Eastep	de74273dbb	Assume EXPORTMODULES=No if it doesn't exist in old file during update Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-27 15:15:03 -07:00
Tom Eastep	af1e2f6c8b	Read capabilities file before the .conf file Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-27 11:26:26 -07:00
Tom Eastep	dc2406d25b	update -t also converts the 'tos' file Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-26 13:51:02 -07:00
Tom Eastep	e0734a45ee	Allow 'seconds' and 'minutes' in LOGLIMIT specifications Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-26 12:53:36 -07:00
Tom Eastep	28df894add	Improve 'update' - convert BLACKLISTNEWONLY - convert LOGRATE and LOGBURST - default USE_DEFAULT_RT to No Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-26 12:50:56 -07:00
Tom Eastep	1d8873d3d5	Correct the shorewall6-hosts man page Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-26 12:28:57 -07:00
Tom Eastep	ad06ec3eef	Correct IPV6 range parsing Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-26 11:52:51 -07:00
Tom Eastep	eae492cef5	Some rules manpage updates Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-22 09:24:47 -07:00
Tom Eastep	05f9f926c4	Move fatal_error() to lib.base Signed-off-by: Tom Eastep <teastep@shorewall.net> Conflicts: Shorewall-core/lib.common	2015-08-21 14:32:09 -07:00
Tom Eastep	a709395949	Allow 'none' in the log level argument to AutoBL Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-21 13:40:12 -07:00
Tom Eastep	7956c5f6e0	Update a message to refer to the 'mangle' file rather than 'tcrules' Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-20 14:48:29 -07:00
Tom Eastep	4b003163d6	Use NYTProf for profiling. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-19 14:05:15 -07:00
Tom Eastep	67aef659b5	Tweak tcrules references Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-19 12:57:36 -07:00
Tom Eastep	39982c20c4	Restore the text of tcrules warning message Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-19 12:34:35 -07:00
Tom Eastep	2b1f33c391	Don't unlink the tcrules file. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-19 11:48:23 -07:00
Tom Eastep	1c33717cf5	Reverse the change to delete host routes Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-19 11:06:28 -07:00
Tom Eastep	cd8fe38c85	Delete host routes added to the main routing table for providers Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-19 10:44:37 -07:00
Tom Eastep	d525419c65	Correct wording of an error message Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-19 10:44:00 -07:00
Tom Eastep	0e67357d63	Rewrite the trace/debugging section of the start/stop article Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-18 16:00:37 -07:00
Tom Eastep	537f53f611	Restore [Install] section in the Debian .service files Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-17 07:41:15 -07:00
Tom Eastep	3b1ad1e284	Delete 'conflicts=' from Shorewall-init .service files Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-17 06:40:36 -07:00
Tom Eastep	9d3f35a22d	Enable new update options in compiler.pl Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-16 11:57:36 -07:00
Tom Eastep	7c2a969de0	Correct handling of notrack file. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-14 09:26:45 -07:00
Tom Eastep	8bdea65325	Update manpages for new update options Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-13 16:12:28 -07:00
Tom Eastep	fd46c0ffed	Correct handling of termination after .conf file not updated Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-13 15:42:38 -07:00
Tom Eastep	60acddbb37	Add conversion version and date to the converted files. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-13 14:37:13 -07:00
Tom Eastep	306dc34b31	Correct convert_blacklist() Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-13 13:22:14 -07:00
Tom Eastep	f5c6a6fe82	Correct tcrules update Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-13 13:21:51 -07:00
Tom Eastep	af2b7910bd	Port update changes from 5.0.0 Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-12 12:33:09 -07:00
Tom Eastep	3b59e46799	Restore Debian-specific service files Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-12 10:19:07 -07:00
Tom Eastep	955a2e38b7	Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code	2015-08-10 17:49:40 -07:00
Tom Eastep	4c4c5a436a	Allow zero-valued options on multi-zoned interfaces Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-07 14:09:08 -07:00
Tom Eastep	d949824f94	Correct shorewall-mangle(5) examples Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-08-06 10:15:57 -07:00