From 8aefb3a998fd2cb147dcb77c9849d885de27eded Mon Sep 17 00:00:00 2001 From: Tuomo Soini Date: Mon, 9 Nov 2015 09:44:03 +0200 Subject: [PATCH 1/5] Shorewall6: upgrade conntrack to ?VERSION 3 Signed-off-by: Tuomo Soini --- Shorewall6/configfiles/conntrack | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Shorewall6/configfiles/conntrack b/Shorewall6/configfiles/conntrack index 067b03ee5..e8ca2a7d5 100644 --- a/Shorewall6/configfiles/conntrack +++ b/Shorewall6/configfiles/conntrack @@ -4,50 +4,50 @@ # For information about entries in this file, type "man shorewall6-conntrack" # ############################################################################################################## -?FORMAT 2 +?FORMAT 3 #ACTION SOURCE DESTINATION PROTO DEST SOURCE USER/ SWITCH # PORT(S) PORT(S) GROUP -?if __CT_TARGET +?if $AUTOHELPERS && __CT_TARGET ?if __AMANDA_HELPER -CT:helper:amanda all - udp 10080 +CT:helper:amanda:PO - - udp 10080 ?endif ?if __FTP_HELPER -CT:helper:ftp all - tcp 21 +CT:helper:ftp:PO - - tcp 21 ?endif ?if __H323_HELPER -CT:helper:RAS all - udp 1719 -CT:helper:Q.931 all - tcp 1720 +CT:helper:RAS:PO - - udp 1719 +CT:helper:Q.931:PO - - tcp 1720 ?endif ?if __IRC_HELPER -CT:helper:irc all - tcp 6667 +CT:helper:irc:PO - - tcp 6667 ?endif ?if __NETBIOS_NS_HELPER -CT:helper:netbios-ns all - udp 137 +CT:helper:netbios-ns:PO - - udp 137 ?endif ?if __PPTP_HELPER -CT:helper:pptp all - tcp 1723 +CT:helper:pptp:PO - - tcp 1723 ?endif ?if __SANE_HELPER -CT:helper:sane all - tcp 6566 +CT:helper:sane:PO - - tcp 6566 ?endif ?if __SIP_HELPER -CT:helper:sip all - udp 5060 +CT:helper:sip:PO - - udp 5060 ?endif ?if __SNMP_HELPER -CT:helper:snmp all - udp 161 +CT:helper:snmp:PO - - udp 161 ?endif ?if __TFTP_HELPER -CT:helper:tftp all - udp 69 +CT:helper:tftp:PO - - udp 69 ?endif ?endif From f095e6f31d99df5497601f90d9312825e879db23 Mon Sep 17 00:00:00 2001 From: Tuomo Soini Date: Mon, 9 Nov 2015 10:24:20 +0200 Subject: [PATCH 2/5] configfiles: unified configuration file formatting Signed-off-by: Tuomo Soini --- Shorewall/configfiles/accounting | 2 ++ Shorewall/configfiles/arprules | 2 ++ Shorewall/configfiles/blrules | 2 ++ Shorewall/configfiles/conntrack | 3 +++ Shorewall/configfiles/ecn | 2 ++ Shorewall/configfiles/hosts | 2 ++ Shorewall/configfiles/init | 4 ++-- Shorewall/configfiles/initdone | 8 ++++---- Shorewall/configfiles/interfaces | 2 ++ Shorewall/configfiles/isusable | 12 ++++++------ Shorewall/configfiles/maclist | 2 ++ Shorewall/configfiles/mangle | 3 +++ Shorewall/configfiles/masq | 2 ++ Shorewall/configfiles/nat | 2 ++ Shorewall/configfiles/netmap | 2 ++ Shorewall/configfiles/params | 24 ++++++++++++------------ Shorewall/configfiles/policy | 2 ++ Shorewall/configfiles/providers | 2 ++ Shorewall/configfiles/proxyarp | 2 ++ Shorewall/configfiles/restored | 4 ++-- Shorewall/configfiles/routes | 3 +++ Shorewall/configfiles/rtrules | 3 +++ Shorewall/configfiles/rules | 2 ++ Shorewall/configfiles/secmarks | 2 ++ Shorewall/configfiles/start | 4 ++-- Shorewall/configfiles/started | 16 ++++++++-------- Shorewall/configfiles/stop | 4 ++-- Shorewall/configfiles/stopped | 4 ++-- Shorewall/configfiles/stoppedrules | 2 ++ Shorewall/configfiles/tcclasses | 2 ++ Shorewall/configfiles/tcdevices | 2 ++ Shorewall/configfiles/tcfilters | 2 ++ Shorewall/configfiles/tcinterfaces | 2 ++ Shorewall/configfiles/tcpri | 2 ++ Shorewall/configfiles/tunnels | 2 ++ Shorewall/configfiles/zones | 2 ++ Shorewall6/configfiles/accounting | 2 ++ Shorewall6/configfiles/blrules | 2 ++ Shorewall6/configfiles/conntrack | 3 +++ Shorewall6/configfiles/findgw | 2 +- Shorewall6/configfiles/hosts | 2 ++ Shorewall6/configfiles/init | 4 ++-- Shorewall6/configfiles/interfaces | 2 ++ Shorewall6/configfiles/isusable | 12 ++++++------ Shorewall6/configfiles/maclist | 2 ++ Shorewall6/configfiles/mangle | 3 +++ Shorewall6/configfiles/masq | 2 ++ Shorewall6/configfiles/nat | 2 ++ Shorewall6/configfiles/netmap | 2 ++ Shorewall6/configfiles/params | 22 +++++++++++----------- Shorewall6/configfiles/policy | 2 ++ Shorewall6/configfiles/providers | 2 ++ Shorewall6/configfiles/proxyndp | 4 +++- Shorewall6/configfiles/restored | 4 ++-- Shorewall6/configfiles/routes | 3 +++ Shorewall6/configfiles/routestopped | 2 ++ Shorewall6/configfiles/rtrules | 3 +++ Shorewall6/configfiles/rules | 2 ++ Shorewall6/configfiles/scfilter | 4 ++-- Shorewall6/configfiles/secmarks | 2 ++ Shorewall6/configfiles/start | 4 ++-- Shorewall6/configfiles/started | 16 ++++++++-------- Shorewall6/configfiles/stop | 4 ++-- Shorewall6/configfiles/stopped | 4 ++-- Shorewall6/configfiles/stoppedrules | 2 ++ Shorewall6/configfiles/tcclasses | 2 ++ Shorewall6/configfiles/tcdevices | 2 ++ Shorewall6/configfiles/tcfilters | 2 ++ Shorewall6/configfiles/tcinterfaces | 2 ++ Shorewall6/configfiles/tcpri | 2 ++ Shorewall6/configfiles/tunnels | 2 ++ Shorewall6/configfiles/zones | 2 ++ 72 files changed, 193 insertions(+), 79 deletions(-) diff --git a/Shorewall/configfiles/accounting b/Shorewall/configfiles/accounting index 37f3fc3d9..7fc6bd4d8 100644 --- a/Shorewall/configfiles/accounting +++ b/Shorewall/configfiles/accounting @@ -1,6 +1,8 @@ # # Shorewall - Accounting File # +# /etc/shorewall/accounting +# # For information about entries in this file, type "man shorewall-accounting" # # Please see http://shorewall.net/Accounting.html for examples and diff --git a/Shorewall/configfiles/arprules b/Shorewall/configfiles/arprules index 249de2b38..ededf7d1a 100644 --- a/Shorewall/configfiles/arprules +++ b/Shorewall/configfiles/arprules @@ -1,6 +1,8 @@ # # Shorewall - Arprules File # +# /etc/shorewall/arprules +# # For information about entries in this file, type "man shorewall-arprules" # ############################################################################################################## diff --git a/Shorewall/configfiles/blrules b/Shorewall/configfiles/blrules index 7353edfaa..40f54cde3 100644 --- a/Shorewall/configfiles/blrules +++ b/Shorewall/configfiles/blrules @@ -1,6 +1,8 @@ # # Shorewall - Blrules File # +# /etc/shorewall/blrules +# # For information about entries in this file, type "man shorewall-blrules" # # Please see http://shorewall.net/blacklisting_support.htm for additional diff --git a/Shorewall/configfiles/conntrack b/Shorewall/configfiles/conntrack index 02f80fb19..be28b40e5 100644 --- a/Shorewall/configfiles/conntrack +++ b/Shorewall/configfiles/conntrack @@ -1,10 +1,13 @@ # # Shorewall - Conntrack File # +# /etc/shorewall/conntrack +# # For information about entries in this file, type "man shorewall-conntrack" # ############################################################################################################## ?FORMAT 3 +############################################################################################################## #ACTION SOURCE DESTINATION PROTO DEST SOURCE USER/ SWITCH # PORT(S) PORT(S) GROUP ?if $AUTOHELPERS && __CT_TARGET diff --git a/Shorewall/configfiles/ecn b/Shorewall/configfiles/ecn index ebe557108..908f3f0a1 100644 --- a/Shorewall/configfiles/ecn +++ b/Shorewall/configfiles/ecn @@ -1,6 +1,8 @@ # # Shorewall - Ecn File # +# /etc/shorewall/ecn +# # For information about entries in this file, type "man shorewall-ecn" # # The manpage is also online at diff --git a/Shorewall/configfiles/hosts b/Shorewall/configfiles/hosts index 493afaff1..b00b89ebd 100644 --- a/Shorewall/configfiles/hosts +++ b/Shorewall/configfiles/hosts @@ -1,6 +1,8 @@ # # Shorewall - Hosts file # +# /etc/shorewall/hosts +# # For information about entries in this file, type "man shorewall-hosts" # # The manpage is also online at diff --git a/Shorewall/configfiles/init b/Shorewall/configfiles/init index 96a3db293..813fcf04f 100644 --- a/Shorewall/configfiles/init +++ b/Shorewall/configfiles/init @@ -3,8 +3,8 @@ # # /etc/shorewall/init # -# Add commands below that you want to be executed at the beginning of -# a "shorewall start", "shorewall-reload" or "shorewall restart" command. +# Add commands below that you want to be executed at the beginning of +# a "shorewall start", "shorewall-reload" or "shorewall restart" command. # # For additional information, see # http://shorewall.net/shorewall_extension_scripts.htm diff --git a/Shorewall/configfiles/initdone b/Shorewall/configfiles/initdone index f73782dd6..2aab056b3 100644 --- a/Shorewall/configfiles/initdone +++ b/Shorewall/configfiles/initdone @@ -3,10 +3,10 @@ # # /etc/shorewall/initdone # -# Add commands below that you want to be executed during -# "shorewall start", "shorewall reload" or "shorewall restart" commands -# at the point where Shorewall has not yet added any permanent rules to -# the builtin chains. +# Add commands below that you want to be executed during +# "shorewall start", "shorewall reload" or "shorewall restart" commands +# at the point where Shorewall has not yet added any permanent rules to +# the builtin chains. # # For additional information, see # http://shorewall.net/shorewall_extension_scripts.htm diff --git a/Shorewall/configfiles/interfaces b/Shorewall/configfiles/interfaces index 5e5dd87a6..c8c3573d1 100644 --- a/Shorewall/configfiles/interfaces +++ b/Shorewall/configfiles/interfaces @@ -1,6 +1,8 @@ # # Shorewall - Interfaces File # +# /etc/shorewall/interfaces +# # For information about entries in this file, type "man shorewall-interfaces" # # The manpage is also online at diff --git a/Shorewall/configfiles/isusable b/Shorewall/configfiles/isusable index 0bf72e7f8..d3cda4f5d 100644 --- a/Shorewall/configfiles/isusable +++ b/Shorewall/configfiles/isusable @@ -3,13 +3,13 @@ # # /etc/shorewall/isusable # -# This script is called when Shorewall is attempting to determine -# if an interface named in /etc/shorewall/providers is usable. +# This script is called when Shorewall is attempting to determine +# if an interface named in /etc/shorewall/providers is usable. # -# The script is invoked inside a function that accepts an interface -# name as a single argument. The file below is designed to work with -# both swping and lsm as described at -# http://www.shorewall.net/MultiISP.html +# The script is invoked inside a function that accepts an interface +# name as a single argument. The file below is designed to work with +# both swping and lsm as described at +# http://www.shorewall.net/MultiISP.html # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall/configfiles/maclist b/Shorewall/configfiles/maclist index c8ff98ff9..0df37a1ae 100644 --- a/Shorewall/configfiles/maclist +++ b/Shorewall/configfiles/maclist @@ -1,6 +1,8 @@ # # Shorewall - Maclist file # +# /etc/shorewall/maclist +# # For information about entries in this file, type "man shorewall-maclist" # # For additional information, see http://shorewall.net/MAC_Validation.html diff --git a/Shorewall/configfiles/mangle b/Shorewall/configfiles/mangle index 76e402e58..ce1310d3b 100644 --- a/Shorewall/configfiles/mangle +++ b/Shorewall/configfiles/mangle @@ -1,6 +1,8 @@ # # Shorewall - Mangle File # +# /etc/shorewall/mangle +# # For information about entries in this file, type "man shorewall-mangle" # # See http://shorewall.net/traffic_shaping.htm for additional information. @@ -9,6 +11,7 @@ # # See http://shorewall.net/PacketMarking.html for a detailed description of # the Netfilter/Shorewall packet marking mechanism. +# #################################################################################################################################################### #ACTION SOURCE DEST PROTO DEST SOURCE USER TEST LENGTH TOS CONNBYTES HELPER PROBABILITY DSCP # PORT(S) PORT(S) diff --git a/Shorewall/configfiles/masq b/Shorewall/configfiles/masq index 3510312ae..2ca9ecc82 100644 --- a/Shorewall/configfiles/masq +++ b/Shorewall/configfiles/masq @@ -1,6 +1,8 @@ # # Shorewall - Masq file # +# /etc/shorewall/masq +# # For information about entries in this file, type "man shorewall-masq" # # The manpage is also online at diff --git a/Shorewall/configfiles/nat b/Shorewall/configfiles/nat index 66a481843..f72ee92b3 100644 --- a/Shorewall/configfiles/nat +++ b/Shorewall/configfiles/nat @@ -1,6 +1,8 @@ # # Shorewall - Nat File # +# /etc/shorewall/nat +# # For information about entries in this file, type "man shorewall-nat" # # For additional information, see http://shorewall.net/NAT.htm diff --git a/Shorewall/configfiles/netmap b/Shorewall/configfiles/netmap index 5dadf204d..54e7fb85c 100644 --- a/Shorewall/configfiles/netmap +++ b/Shorewall/configfiles/netmap @@ -1,6 +1,8 @@ # # Shorewall - Netmap File # +# /etc/shorewall/netmap +# # For information about entries in this file, type "man shorewall-netmap" # # See http://shorewall.net/netmap.html for an example and usage diff --git a/Shorewall/configfiles/params b/Shorewall/configfiles/params index abaa0fbce..332256486 100644 --- a/Shorewall/configfiles/params +++ b/Shorewall/configfiles/params @@ -3,25 +3,25 @@ # # /etc/shorewall/params # -# Assign any variables that you need here. +# Assign any variables that you need here. # -# It is suggested that variable names begin with an upper case letter -# to distinguish them from variables used internally within the -# Shorewall programs +# It is suggested that variable names begin with an upper case letter +# to distinguish them from variables used internally within the +# Shorewall programs # -# Example: +# Example: # -# NET_IF=eth0 -# NET_BCAST=130.252.100.255 -# NET_OPTIONS=routefilter,norfc1918 +# NET_IF=eth0 +# NET_BCAST=130.252.100.255 +# NET_OPTIONS=routefilter,norfc1918 # -# Example (/etc/shorewall/interfaces record): +# Example (/etc/shorewall/interfaces record): # -# net $NET_IF $NET_BCAST $NET_OPTIONS +# net $NET_IF $NET_BCAST $NET_OPTIONS # -# The result will be the same as if the record had been written +# The result will be the same as if the record had been written # -# net eth0 130.252.100.255 routefilter,norfc1918 +# net eth0 130.252.100.255 routefilter,norfc1918 # ############################################################################### diff --git a/Shorewall/configfiles/policy b/Shorewall/configfiles/policy index d8a2f4e10..0503774ba 100644 --- a/Shorewall/configfiles/policy +++ b/Shorewall/configfiles/policy @@ -1,6 +1,8 @@ # # Shorewall - Policy File # +# /etc/shorewall/policy +# # For information about entries in this file, type "man shorewall-policy" # # The manpage is also online at diff --git a/Shorewall/configfiles/providers b/Shorewall/configfiles/providers index 0b6113da7..a55bfc776 100644 --- a/Shorewall/configfiles/providers +++ b/Shorewall/configfiles/providers @@ -1,6 +1,8 @@ # # Shorewall - Providers File # +# /etc/shorewall/providers +# # For information about entries in this file, type "man shorewall-providers" # # For additional information, see http://shorewall.net/MultiISP.html diff --git a/Shorewall/configfiles/proxyarp b/Shorewall/configfiles/proxyarp index f79fac53d..36adc2055 100644 --- a/Shorewall/configfiles/proxyarp +++ b/Shorewall/configfiles/proxyarp @@ -1,6 +1,8 @@ # # Shorewall - Proxyarp File # +# /etc/shorewall/proxyarp +# # For information about entries in this file, type "man shorewall-proxyarp" # # See http://shorewall.net/ProxyARP.htm for additional information. diff --git a/Shorewall/configfiles/restored b/Shorewall/configfiles/restored index 226f076d0..594896eaa 100644 --- a/Shorewall/configfiles/restored +++ b/Shorewall/configfiles/restored @@ -3,8 +3,8 @@ # # /etc/shorewall/restored # -# Add commands below that you want to be executed after shorewall has -# completed a 'restore' command. +# Add commands below that you want to be executed after shorewall has +# completed a 'restore' command. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall/configfiles/routes b/Shorewall/configfiles/routes index 90f036f0f..9440e8cdb 100644 --- a/Shorewall/configfiles/routes +++ b/Shorewall/configfiles/routes @@ -1,8 +1,11 @@ # # Shorewall - Routes File # +# /etc/shorewall/routes +# # For information about entries in this file, type "man shorewall-routes" # # For additional information, see http://www.shorewall.net/MultiISP.html +# ############################################################################### #PROVIDER DEST GATEWAY DEVICE OPTIONS diff --git a/Shorewall/configfiles/rtrules b/Shorewall/configfiles/rtrules index 0b31d54cb..9cde3371d 100644 --- a/Shorewall/configfiles/rtrules +++ b/Shorewall/configfiles/rtrules @@ -1,8 +1,11 @@ # # Shorewall - Rtrules File # +# /etc/shorewall/rtrules +# # For information about entries in this file, type "man shorewall-rtrules" # # For additional information, see http://www.shorewall.net/MultiISP.html +# #################################################################################### #SOURCE DEST PROVIDER PRIORITY MASK diff --git a/Shorewall/configfiles/rules b/Shorewall/configfiles/rules index 8f6c72187..474e1862e 100644 --- a/Shorewall/configfiles/rules +++ b/Shorewall/configfiles/rules @@ -1,6 +1,8 @@ # # Shorewall - Rules File # +# /etc/shorewall/rules +# # For information on the settings in this file, type "man shorewall-rules" # # The manpage is also online at diff --git a/Shorewall/configfiles/secmarks b/Shorewall/configfiles/secmarks index b560923d3..b1b2b518e 100644 --- a/Shorewall/configfiles/secmarks +++ b/Shorewall/configfiles/secmarks @@ -1,6 +1,8 @@ # # Shorewall - Secmarks File # +# /etc/shorewall/secmarks +# # For information about entries in this file, type "man shorewall-secmarks" # ############################################################################################################ diff --git a/Shorewall/configfiles/start b/Shorewall/configfiles/start index aca286a40..4f698d358 100644 --- a/Shorewall/configfiles/start +++ b/Shorewall/configfiles/start @@ -3,8 +3,8 @@ # # /etc/shorewall/start # -# Add commands below that you want to be executed after shorewall has -# been started, reloaded or restarted. +# Add commands below that you want to be executed after shorewall has +# been started, reloaded or restarted. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall/configfiles/started b/Shorewall/configfiles/started index 5baac968f..2fef8a7ca 100644 --- a/Shorewall/configfiles/started +++ b/Shorewall/configfiles/started @@ -3,15 +3,15 @@ # # /etc/shorewall/started # -# Add commands below that you want to be executed after shorewall has -# been completely started, reloaded or restarted. The difference between -# this extension script and /etc/shorewall/start is that this one is -# invoked after the 'shorewall' chain has been created (thus -# signaling that the firewall is completely up). +# Add commands below that you want to be executed after shorewall has +# been completely started, reloaded or restarted. The difference between +# this extension script and /etc/shorewall/start is that this one is +# invoked after the 'shorewall' chain has been created (thus +# signaling that the firewall is completely up). # -# This script should not change the firewall configuration directly but -# may do so indirectly by running /sbin/shorewall with the 'nolock' -# option. +# This script should not change the firewall configuration directly but +# may do so indirectly by running /sbin/shorewall with the 'nolock' +# option. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall/configfiles/stop b/Shorewall/configfiles/stop index 7d69b07e6..7e112aeb3 100644 --- a/Shorewall/configfiles/stop +++ b/Shorewall/configfiles/stop @@ -3,8 +3,8 @@ # # /etc/shorewall/stop # -# Add commands below that you want to be executed at the beginning of a -# "shorewall stop" command. +# Add commands below that you want to be executed at the beginning of a +# "shorewall stop" command. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall/configfiles/stopped b/Shorewall/configfiles/stopped index 13defd8a0..c8ca296c2 100644 --- a/Shorewall/configfiles/stopped +++ b/Shorewall/configfiles/stopped @@ -3,8 +3,8 @@ # # /etc/shorewall/stopped # -# Add commands below that you want to be executed at the completion of a -# "shorewall stop" command. +# Add commands below that you want to be executed at the completion of a +# "shorewall stop" command. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall/configfiles/stoppedrules b/Shorewall/configfiles/stoppedrules index 395553a17..bbe737296 100644 --- a/Shorewall/configfiles/stoppedrules +++ b/Shorewall/configfiles/stoppedrules @@ -1,6 +1,8 @@ # # Shorewall - Stoppedrules File # +# /etc/shorewall/stoppedrules +# # For information about entries in this file, type "man shorewall-stoppedrules" # # The manpage is also online at diff --git a/Shorewall/configfiles/tcclasses b/Shorewall/configfiles/tcclasses index c6ccf100d..f2c7fbc16 100644 --- a/Shorewall/configfiles/tcclasses +++ b/Shorewall/configfiles/tcclasses @@ -1,6 +1,8 @@ # # Shorewall - Tcclasses File # +# /etc/shorewall/tcclasses +# # For information about entries in this file, type "man shorewall-tcclasses" # # See http://shorewall.net/traffic_shaping.htm for additional information. diff --git a/Shorewall/configfiles/tcdevices b/Shorewall/configfiles/tcdevices index 4afe83215..6ff0cdebf 100644 --- a/Shorewall/configfiles/tcdevices +++ b/Shorewall/configfiles/tcdevices @@ -1,6 +1,8 @@ # # Shorewall - Tcdevices File # +# /etc/shorewall/tcdevices +# # For information about entries in this file, type "man shorewall-tcdevices" # # See http://shorewall.net/traffic_shaping.htm for additional information. diff --git a/Shorewall/configfiles/tcfilters b/Shorewall/configfiles/tcfilters index e2952deba..b6ead64b5 100644 --- a/Shorewall/configfiles/tcfilters +++ b/Shorewall/configfiles/tcfilters @@ -1,6 +1,8 @@ # # Shorewall - Tcfilters File # +# /etc/shorewall/tcfilters +# # For information about entries in this file, type "man shorewall-tcfilters" # # See http://shorewall.net/traffic_shaping.htm for additional information. diff --git a/Shorewall/configfiles/tcinterfaces b/Shorewall/configfiles/tcinterfaces index b3161c4a6..15cd39b67 100644 --- a/Shorewall/configfiles/tcinterfaces +++ b/Shorewall/configfiles/tcinterfaces @@ -1,6 +1,8 @@ # # Shorewall - Tcinterfaces File # +# /etc/shorewall/tcinterfaces +# # For information about entries in this file, type "man shorewall-tcinterfaces" # # See http://shorewall.net/simple_traffic_shaping.htm for additional diff --git a/Shorewall/configfiles/tcpri b/Shorewall/configfiles/tcpri index ab70d77b3..89520931b 100644 --- a/Shorewall/configfiles/tcpri +++ b/Shorewall/configfiles/tcpri @@ -1,6 +1,8 @@ # # Shorewall - Tcpri File # +# /etc/shorewall/tcpri +# # For information about entries in this file, type "man shorewall-tcpri" # # See http://shorewall.net/simple_traffic_shaping.htm for additional diff --git a/Shorewall/configfiles/tunnels b/Shorewall/configfiles/tunnels index a313bbe91..2bafc7282 100644 --- a/Shorewall/configfiles/tunnels +++ b/Shorewall/configfiles/tunnels @@ -1,6 +1,8 @@ # # Shorewall - Tunnels File # +# /etc/shorewall/tunnels +# # For information about entries in this file, type "man shorewall-tunnels" # # The manpage is also online at diff --git a/Shorewall/configfiles/zones b/Shorewall/configfiles/zones index e42e8020b..31197da85 100644 --- a/Shorewall/configfiles/zones +++ b/Shorewall/configfiles/zones @@ -1,6 +1,8 @@ # # Shorewall - Zones File # +# /etc/shorewall/zones +# # For information about this file, type "man shorewall-zones" # # The manpage is also online at diff --git a/Shorewall6/configfiles/accounting b/Shorewall6/configfiles/accounting index 2d7bd2cdc..bd61bde6c 100644 --- a/Shorewall6/configfiles/accounting +++ b/Shorewall6/configfiles/accounting @@ -1,6 +1,8 @@ # # Shorewall6 - Accounting File # +# /etc/shorewall6/accounting +# # For information about entries in this file, type "man shorewall6-accounting" # # Please see http://shorewall.net/Accounting.html for examples and diff --git a/Shorewall6/configfiles/blrules b/Shorewall6/configfiles/blrules index f1d1c8d1c..34fa70331 100644 --- a/Shorewall6/configfiles/blrules +++ b/Shorewall6/configfiles/blrules @@ -1,6 +1,8 @@ # # Shorewall6 - Blrules File # +# /etc/shorewall6/blrules +# # For information about entries in this file, type "man shorewall6-blrules" # # Please see http://shorewall.net/blacklisting_support.htm for additional diff --git a/Shorewall6/configfiles/conntrack b/Shorewall6/configfiles/conntrack index e8ca2a7d5..1fff3114c 100644 --- a/Shorewall6/configfiles/conntrack +++ b/Shorewall6/configfiles/conntrack @@ -1,10 +1,13 @@ # # Shorewall6 - Conntrack File # +# /etc/shorewall6/conntrack +# # For information about entries in this file, type "man shorewall6-conntrack" # ############################################################################################################## ?FORMAT 3 +############################################################################################################## #ACTION SOURCE DESTINATION PROTO DEST SOURCE USER/ SWITCH # PORT(S) PORT(S) GROUP ?if $AUTOHELPERS && __CT_TARGET diff --git a/Shorewall6/configfiles/findgw b/Shorewall6/configfiles/findgw index 80325f968..d3b4a3c73 100644 --- a/Shorewall6/configfiles/findgw +++ b/Shorewall6/configfiles/findgw @@ -1,5 +1,5 @@ # -# Shorewall - Findgw File +# Shorewall6 - Findgw File # # /etc/shorewall6/findgw # diff --git a/Shorewall6/configfiles/hosts b/Shorewall6/configfiles/hosts index 2388e1951..8bd10b1e2 100644 --- a/Shorewall6/configfiles/hosts +++ b/Shorewall6/configfiles/hosts @@ -1,6 +1,8 @@ # # Shorewall6 - Hosts file # +# /etc/shorewall6/hosts +# # For information about entries in this file, type "man shorewall6-hosts" # # The manpage is also online at diff --git a/Shorewall6/configfiles/init b/Shorewall6/configfiles/init index 723dcea0f..5e59d1203 100644 --- a/Shorewall6/configfiles/init +++ b/Shorewall6/configfiles/init @@ -3,8 +3,8 @@ # # /etc/shorewall6/init # -# Add commands below that you want to be executed at the beginning of -# a "shorewall6 start" or "shorewall6 restart" command. +# Add commands below that you want to be executed at the beginning of +# a "shorewall6 start" or "shorewall6 restart" command. # # For additional information, see # http://shorewall.net/shorewall_extension_scripts.htm diff --git a/Shorewall6/configfiles/interfaces b/Shorewall6/configfiles/interfaces index 5bee50c7d..2b1e2f283 100644 --- a/Shorewall6/configfiles/interfaces +++ b/Shorewall6/configfiles/interfaces @@ -1,6 +1,8 @@ # # Shorewall6 - Interfaces File # +# /etc/shorewall6/interfaces +# # For information about entries in this file, type "man shorewall6-interfaces" # # The manpage is also online at diff --git a/Shorewall6/configfiles/isusable b/Shorewall6/configfiles/isusable index 4ab9f9157..96b0831b5 100644 --- a/Shorewall6/configfiles/isusable +++ b/Shorewall6/configfiles/isusable @@ -3,13 +3,13 @@ # # /etc/shorewall6/isusable # -# This script is called when Shorewall6 is attempting to determine -# if an interface named in /etc/shorewall6/providers is usable. +# This script is called when Shorewall6 is attempting to determine +# if an interface named in /etc/shorewall6/providers is usable. # -# The script is invoked inside a function that accepts an interface -# name as a single argument. The file below is designed to work with -# both swping and lsm as described at -# http://www.shorewall.net/MultiISP.html +# The script is invoked inside a function that accepts an interface +# name as a single argument. The file below is designed to work with +# both swping and lsm as described at +# http://www.shorewall.net/MultiISP.html # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall6/configfiles/maclist b/Shorewall6/configfiles/maclist index a071328b3..1fafd9e49 100644 --- a/Shorewall6/configfiles/maclist +++ b/Shorewall6/configfiles/maclist @@ -1,6 +1,8 @@ # # Shorewall6 - Maclist file # +# /etc/shorewall6/maclist +# # For information about entries in this file, type "man shorewall6-maclist" # # For additional information, see http://shorewall.net/MAC_Validation.html diff --git a/Shorewall6/configfiles/mangle b/Shorewall6/configfiles/mangle index 19d42313f..a93fc7aaf 100644 --- a/Shorewall6/configfiles/mangle +++ b/Shorewall6/configfiles/mangle @@ -1,6 +1,8 @@ # # Shorewall6 - Mangle File # +# /etc/shorewall6/mangle +# # For information about entries in this file, type "man shorewall6-mangle" # # See http://shorewall.net/traffic_shaping.htm for additional information. @@ -9,6 +11,7 @@ # # See http://shorewall.net/PacketMarking.html for a detailed description of # the Netfilter/Shorewall packet marking mechanism. +# ############################################################################################################################################################ #ACTION SOURCE DEST PROTO DEST SOURCE USER TEST LENGTH TOS CONNBYTES HELPER HEADERS PROBABILITY DSCP # PORT(S) PORT(S) diff --git a/Shorewall6/configfiles/masq b/Shorewall6/configfiles/masq index f0997a366..464a23462 100644 --- a/Shorewall6/configfiles/masq +++ b/Shorewall6/configfiles/masq @@ -1,6 +1,8 @@ # # Shorewall6 - Masq file # +# /etc/shorewall6/masq +# # For information about entries in this file, type "man shorewall6-masq" # # The manpage is also online at diff --git a/Shorewall6/configfiles/nat b/Shorewall6/configfiles/nat index f45896436..cfab54dc3 100644 --- a/Shorewall6/configfiles/nat +++ b/Shorewall6/configfiles/nat @@ -1,6 +1,8 @@ # # Shorewall6 - Nat File # +# /etc/shorewall6/nat +# # For information about entries in this file, type "man shorewall6-nat" # # The manpage is also online at diff --git a/Shorewall6/configfiles/netmap b/Shorewall6/configfiles/netmap index c93d978a1..f59c9845a 100644 --- a/Shorewall6/configfiles/netmap +++ b/Shorewall6/configfiles/netmap @@ -1,6 +1,8 @@ # # Shorewall6 - Netmap File # +# /etc/shorewall6/netmap +# # For information about entries in this file, type "man shorewall-netmap" # # See http://shorewall.net/netmap.html for an example and usage diff --git a/Shorewall6/configfiles/params b/Shorewall6/configfiles/params index 2e0c1a696..0cd5087b8 100644 --- a/Shorewall6/configfiles/params +++ b/Shorewall6/configfiles/params @@ -3,24 +3,24 @@ # # /etc/shorewall6/params # -# Assign any variables that you need here. +# Assign any variables that you need here. # -# It is suggested that variable names begin with an upper case letter -# to distinguish them from variables used internally within the -# Shorewall6 programs +# It is suggested that variable names begin with an upper case letter +# to distinguish them from variables used internally within the +# Shorewall6 programs # -# Example: +# Example: # -# NET_IF=eth0 -# NET_OPTIONS=dhcp,nosmurfs +# NET_IF=eth0 +# NET_OPTIONS=dhcp,nosmurfs # -# Example (/etc/shorewall6/interfaces record): +# Example (/etc/shorewall6/interfaces record): # -# net $NET_IF - $NET_OPTIONS +# net $NET_IF - $NET_OPTIONS # -# The result will be the same as if the record had been written +# The result will be the same as if the record had been written # -# net eth0 - dhcp,nosmurfs +# net eth0 - dhcp,nosmurfs # ############################################################################### diff --git a/Shorewall6/configfiles/policy b/Shorewall6/configfiles/policy index 1bd333fdd..41dbd5e6a 100644 --- a/Shorewall6/configfiles/policy +++ b/Shorewall6/configfiles/policy @@ -1,6 +1,8 @@ # # Shorewall6 - Policy File # +# /etc/shorewall6/policy +# # For information about entries in this file, type "man shorewall6-policy" # # The manpage is also online at diff --git a/Shorewall6/configfiles/providers b/Shorewall6/configfiles/providers index 0970a7fe4..685061c22 100644 --- a/Shorewall6/configfiles/providers +++ b/Shorewall6/configfiles/providers @@ -1,6 +1,8 @@ # # Shorewall6 - Providers File # +# /etc/shorewall6/providers +# # For information about entries in this file, type "man shorewall6-providers" # # For additional information, see http://shorewall.net/MultiISP.html diff --git a/Shorewall6/configfiles/proxyndp b/Shorewall6/configfiles/proxyndp index a179c1fb7..b2f0a3bff 100644 --- a/Shorewall6/configfiles/proxyndp +++ b/Shorewall6/configfiles/proxyndp @@ -1,5 +1,7 @@ # -# Shorewall - Proxyndp File +# Shorewall6 - Proxyndp File +# +# /etc/shorewall6/proxyndp # # For information about entries in this file, type "man shorewall6-proxyndp" # diff --git a/Shorewall6/configfiles/restored b/Shorewall6/configfiles/restored index 10adb2982..50a367726 100644 --- a/Shorewall6/configfiles/restored +++ b/Shorewall6/configfiles/restored @@ -3,8 +3,8 @@ # # /etc/shorewall6/restored # -# Add commands below that you want to be executed after shorewall6 has -# completed a 'restore' command. +# Add commands below that you want to be executed after shorewall6 has +# completed a 'restore' command. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall6/configfiles/routes b/Shorewall6/configfiles/routes index 3d9e48ba9..63e9212d3 100644 --- a/Shorewall6/configfiles/routes +++ b/Shorewall6/configfiles/routes @@ -1,8 +1,11 @@ # # Shorewall6 - Routes File # +# /etc/shorewall6/routes +# # For information about entries in this file, type "man shorewall6-routes" # # For additional information, see http://www.shorewall.net/MultiISP.html +# ############################################################################### #PROVIDER DEST GATEWAY DEVICE OPTIONS diff --git a/Shorewall6/configfiles/routestopped b/Shorewall6/configfiles/routestopped index a075fbef1..8a908042f 100644 --- a/Shorewall6/configfiles/routestopped +++ b/Shorewall6/configfiles/routestopped @@ -1,6 +1,8 @@ # # Shorewall6 - Routestopped File # +# /etc/shorewall6/routestopped +# # This file is deprecated in favor of the stoppedrules file. # # For information about entries in this file, type "man shorewall6-routestopped" diff --git a/Shorewall6/configfiles/rtrules b/Shorewall6/configfiles/rtrules index f1f94d6cb..d384a1ded 100644 --- a/Shorewall6/configfiles/rtrules +++ b/Shorewall6/configfiles/rtrules @@ -1,8 +1,11 @@ # # Shorewall6 - Rtrules File # +# /etc/shorewall6/rtrules +# # For information about entries in this file, type "man shorewall6-rtrules" # # For additional information, see http://www.shorewall.net/MultiISP.html +# #################################################################################### #SOURCE DEST PROVIDER PRIORITY MASK diff --git a/Shorewall6/configfiles/rules b/Shorewall6/configfiles/rules index 7a2f0049d..d717947a1 100644 --- a/Shorewall6/configfiles/rules +++ b/Shorewall6/configfiles/rules @@ -1,6 +1,8 @@ # # Shorewall6 - Rules File # +# /etc/shorewall6/rules +# # For information on the settings in this file, type "man shorewall6-rules" # # The manpage is also online at diff --git a/Shorewall6/configfiles/scfilter b/Shorewall6/configfiles/scfilter index 16ead3684..e8c97cdbf 100644 --- a/Shorewall6/configfiles/scfilter +++ b/Shorewall6/configfiles/scfilter @@ -1,7 +1,7 @@ # -# Shorewall - Scfilter File +# Shorewall6 - Scfilter File # -# /etc/shorewall/scfilter +# /etc/shorewall6/scfilter # # Replace the 'cat' command below to filter the output of # 'show connections'. diff --git a/Shorewall6/configfiles/secmarks b/Shorewall6/configfiles/secmarks index 8e091288f..31569730d 100644 --- a/Shorewall6/configfiles/secmarks +++ b/Shorewall6/configfiles/secmarks @@ -1,6 +1,8 @@ # # Shorewall6 - Secmarks File # +# /etc/shorewall6/secmarks +# # For information about entries in this file, type "man shorewall-secmarks" # ############################################################################################################ diff --git a/Shorewall6/configfiles/start b/Shorewall6/configfiles/start index 8e6d8b030..757f5d71c 100644 --- a/Shorewall6/configfiles/start +++ b/Shorewall6/configfiles/start @@ -3,8 +3,8 @@ # # /etc/shorewall6/start # -# Add commands below that you want to be executed after shorewall6 has -# been started or restarted. +# Add commands below that you want to be executed after shorewall6 has +# been started or restarted. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall6/configfiles/started b/Shorewall6/configfiles/started index 8bca48bc1..7cc956da2 100644 --- a/Shorewall6/configfiles/started +++ b/Shorewall6/configfiles/started @@ -3,15 +3,15 @@ # # /etc/shorewall6/started # -# Add commands below that you want to be executed after shorewall6 has -# been completely started or restarted. The difference between this -# extension script and /etc/shorewall6/start is that this one is invoked -# after the 'shorewall' chain has been created (thus signaling that the -# firewall is completely up). +# Add commands below that you want to be executed after shorewall6 has +# been completely started or restarted. The difference between this +# extension script and /etc/shorewall6/start is that this one is invoked +# after the 'shorewall' chain has been created (thus signaling that the +# firewall is completely up). # -# This script should not change the firewall configuration directly but -# may do so indirectly by running /sbin/shorewall6 with the 'nolock' -# option. +# This script should not change the firewall configuration directly but +# may do so indirectly by running /sbin/shorewall6 with the 'nolock' +# option. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall6/configfiles/stop b/Shorewall6/configfiles/stop index d13d8ed96..dcc41295d 100644 --- a/Shorewall6/configfiles/stop +++ b/Shorewall6/configfiles/stop @@ -3,8 +3,8 @@ # # /etc/shorewall6/stop # -# Add commands below that you want to be executed at the beginning of a -# "shorewall6 stop" command. +# Add commands below that you want to be executed at the beginning of a +# "shorewall6 stop" command. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall6/configfiles/stopped b/Shorewall6/configfiles/stopped index 9ab1a9083..14e0e31dd 100644 --- a/Shorewall6/configfiles/stopped +++ b/Shorewall6/configfiles/stopped @@ -3,8 +3,8 @@ # # /etc/shorewall6/stopped # -# Add commands below that you want to be executed at the completion of a -# "shorewal6l stop" command. +# Add commands below that you want to be executed at the completion of a +# "shorewall6 stop" command. # # See http://shorewall.net/shorewall_extension_scripts.htm for additional # information. diff --git a/Shorewall6/configfiles/stoppedrules b/Shorewall6/configfiles/stoppedrules index f566a4437..c773bace7 100644 --- a/Shorewall6/configfiles/stoppedrules +++ b/Shorewall6/configfiles/stoppedrules @@ -1,6 +1,8 @@ # # Shorewall6 - Stoppedrules File # +# /etc/shorewall6/stoppedrules +# # For information about entries in this file, # type "man shorewall6-stoppedrules" # diff --git a/Shorewall6/configfiles/tcclasses b/Shorewall6/configfiles/tcclasses index 34359d6a1..4a96af64c 100644 --- a/Shorewall6/configfiles/tcclasses +++ b/Shorewall6/configfiles/tcclasses @@ -1,6 +1,8 @@ # # Shorewall6 - Tcclasses File # +# /etc/shorewall6/tcclasses +# # For information about entries in this file, type "man shorewall6-tcclasses" # # See http://shorewall.net/traffic_shaping.htm for additional information. diff --git a/Shorewall6/configfiles/tcdevices b/Shorewall6/configfiles/tcdevices index fcded3e27..8e48c1113 100644 --- a/Shorewall6/configfiles/tcdevices +++ b/Shorewall6/configfiles/tcdevices @@ -1,6 +1,8 @@ # # Shorewall6 - Tcdevices File # +# /etc/shorewall6/tcdevices +# # For information about entries in this file, type "man shorewall6-tcdevices" # # See http://shorewall.net/traffic_shaping.htm for additional information. diff --git a/Shorewall6/configfiles/tcfilters b/Shorewall6/configfiles/tcfilters index 70b22e103..7b61e0edb 100644 --- a/Shorewall6/configfiles/tcfilters +++ b/Shorewall6/configfiles/tcfilters @@ -1,6 +1,8 @@ # # Shorewall6 - Tcfilters File # +# /etc/shorewall6/tcfilters +# # For information about entries in this file, type "man shorewall6-tcfilters" # # See http://shorewall.net/traffic_shaping.htm for additional information. diff --git a/Shorewall6/configfiles/tcinterfaces b/Shorewall6/configfiles/tcinterfaces index 02345c0aa..174fc60df 100644 --- a/Shorewall6/configfiles/tcinterfaces +++ b/Shorewall6/configfiles/tcinterfaces @@ -1,6 +1,8 @@ # # Shorewall6 - Tcinterfaces File # +# /etc/shorewall6/tcinterfaces +# # For information about entries in this file, # type "man shorewall6-tcinterfaces" # diff --git a/Shorewall6/configfiles/tcpri b/Shorewall6/configfiles/tcpri index 472dfc9e9..53bef89ca 100644 --- a/Shorewall6/configfiles/tcpri +++ b/Shorewall6/configfiles/tcpri @@ -1,6 +1,8 @@ # # Shorewall6 - Tcpri File # +# /etc/shorewall6/tcpri +# # For information about entries in this file, type "man shorewall6-tcpri" # # See http://shorewall.net/simple_traffic_shaping.htm for additional diff --git a/Shorewall6/configfiles/tunnels b/Shorewall6/configfiles/tunnels index 316f63ac4..9733168b4 100644 --- a/Shorewall6/configfiles/tunnels +++ b/Shorewall6/configfiles/tunnels @@ -1,6 +1,8 @@ # # Shorewall6 - Tunnels File # +# /etc/shorewall6/tunnels +# # For information about entries in this file, type "man shorewall6-tunnels" # # The manpage is also online at diff --git a/Shorewall6/configfiles/zones b/Shorewall6/configfiles/zones index 40b129d0f..4a848471c 100644 --- a/Shorewall6/configfiles/zones +++ b/Shorewall6/configfiles/zones @@ -1,6 +1,8 @@ # # Shorewall6 - Zones File # +# /etc/shorewall6/zones +# # For information about this file, type "man shorewall6-zones" # # The manpage is also online at From e989fa1d492387e1a344db952a187b93f58f3258 Mon Sep 17 00:00:00 2001 From: Tuomo Soini Date: Mon, 9 Nov 2015 10:27:07 +0200 Subject: [PATCH 3/5] configfiles/routestopped: add install path Signed-off-by: Tuomo Soini --- Shorewall/configfiles/routestopped | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Shorewall/configfiles/routestopped b/Shorewall/configfiles/routestopped index b271ba683..792d30150 100644 --- a/Shorewall/configfiles/routestopped +++ b/Shorewall/configfiles/routestopped @@ -1,6 +1,8 @@ # # Shorewall - Routestopped File # +# /etc/shorewall/routestopped +# # This file is deprecated in favor of the stoppedrules file # # For information about entries in this file, type "man shorewall-routestopped" From 9460458fd522528f71cf1bf233487d443714a404 Mon Sep 17 00:00:00 2001 From: Tuomo Soini Date: Mon, 9 Nov 2015 23:04:00 +0200 Subject: [PATCH 4/5] Shorewall: reduce number of lines on config headers Signed-off-by: Tuomo Soini --- Shorewall/configfiles/accounting | 4 +--- Shorewall/configfiles/actions | 4 +--- Shorewall/configfiles/arprules | 4 +--- Shorewall/configfiles/blrules | 4 +--- Shorewall/configfiles/clear | 4 +--- Shorewall/configfiles/conntrack | 4 +--- Shorewall/configfiles/ecn | 4 +--- Shorewall/configfiles/findgw | 4 +--- Shorewall/configfiles/hosts | 4 +--- Shorewall/configfiles/init | 4 +--- Shorewall/configfiles/initdone | 4 +--- Shorewall/configfiles/interfaces | 4 +--- Shorewall/configfiles/isusable | 4 +--- Shorewall/configfiles/lib.private | 4 +--- Shorewall/configfiles/maclist | 4 +--- Shorewall/configfiles/mangle | 4 +--- Shorewall/configfiles/masq | 4 +--- Shorewall/configfiles/nat | 4 +--- Shorewall/configfiles/netmap | 4 +--- Shorewall/configfiles/params | 4 +--- Shorewall/configfiles/policy | 4 +--- Shorewall/configfiles/providers | 4 +--- Shorewall/configfiles/proxyarp | 4 +--- Shorewall/configfiles/refresh | 4 +--- Shorewall/configfiles/refreshed | 4 +--- Shorewall/configfiles/restored | 4 +--- Shorewall/configfiles/routes | 4 +--- Shorewall/configfiles/rtrules | 4 +--- Shorewall/configfiles/rules | 4 +--- Shorewall/configfiles/scfilter | 4 +--- Shorewall/configfiles/secmarks | 4 +--- Shorewall/configfiles/start | 4 +--- Shorewall/configfiles/started | 4 +--- Shorewall/configfiles/stop | 4 +--- Shorewall/configfiles/stopped | 4 +--- Shorewall/configfiles/stoppedrules | 4 +--- Shorewall/configfiles/tcclasses | 4 +--- Shorewall/configfiles/tcclear | 4 +--- Shorewall/configfiles/tcdevices | 4 +--- Shorewall/configfiles/tcfilters | 4 +--- Shorewall/configfiles/tcinterfaces | 4 +--- Shorewall/configfiles/tcpri | 4 +--- Shorewall/configfiles/tunnels | 4 +--- Shorewall/configfiles/zones | 4 +--- 44 files changed, 44 insertions(+), 132 deletions(-) diff --git a/Shorewall/configfiles/accounting b/Shorewall/configfiles/accounting index 7fc6bd4d8..90151d03d 100644 --- a/Shorewall/configfiles/accounting +++ b/Shorewall/configfiles/accounting @@ -1,7 +1,5 @@ # -# Shorewall - Accounting File -# -# /etc/shorewall/accounting +# Shorewall -- /etc/shorewall/accounting # # For information about entries in this file, type "man shorewall-accounting" # diff --git a/Shorewall/configfiles/actions b/Shorewall/configfiles/actions index 8509d9a9f..dd6b810cb 100644 --- a/Shorewall/configfiles/actions +++ b/Shorewall/configfiles/actions @@ -1,7 +1,5 @@ # -# Shorewall - Actions File -# -# /etc/shorewall/actions +# Shorewall -- /etc/shorewall/actions # # For information about entries in this file, type "man shorewall-actions" # diff --git a/Shorewall/configfiles/arprules b/Shorewall/configfiles/arprules index ededf7d1a..8a7576307 100644 --- a/Shorewall/configfiles/arprules +++ b/Shorewall/configfiles/arprules @@ -1,7 +1,5 @@ # -# Shorewall - Arprules File -# -# /etc/shorewall/arprules +# Shorewall -- /etc/shorewall/arprules # # For information about entries in this file, type "man shorewall-arprules" # diff --git a/Shorewall/configfiles/blrules b/Shorewall/configfiles/blrules index 40f54cde3..5108cd01e 100644 --- a/Shorewall/configfiles/blrules +++ b/Shorewall/configfiles/blrules @@ -1,7 +1,5 @@ # -# Shorewall - Blrules File -# -# /etc/shorewall/blrules +# Shorewall -- /etc/shorewall/blrules # # For information about entries in this file, type "man shorewall-blrules" # diff --git a/Shorewall/configfiles/clear b/Shorewall/configfiles/clear index d477aea64..8bf025cc7 100644 --- a/Shorewall/configfiles/clear +++ b/Shorewall/configfiles/clear @@ -1,7 +1,5 @@ # -# Shorewall - Clear File -# -# /etc/shorewall/clear +# Shorewall -- /etc/shorewall/clear # # Add commands below that you want to be executed after Shorewall has # processed the 'clear' command. diff --git a/Shorewall/configfiles/conntrack b/Shorewall/configfiles/conntrack index be28b40e5..fb9529762 100644 --- a/Shorewall/configfiles/conntrack +++ b/Shorewall/configfiles/conntrack @@ -1,7 +1,5 @@ # -# Shorewall - Conntrack File -# -# /etc/shorewall/conntrack +# Shorewall -- /etc/shorewall/conntrack # # For information about entries in this file, type "man shorewall-conntrack" # diff --git a/Shorewall/configfiles/ecn b/Shorewall/configfiles/ecn index 908f3f0a1..81aaa1899 100644 --- a/Shorewall/configfiles/ecn +++ b/Shorewall/configfiles/ecn @@ -1,7 +1,5 @@ # -# Shorewall - Ecn File -# -# /etc/shorewall/ecn +# Shorewall -- /etc/shorewall/ecn # # For information about entries in this file, type "man shorewall-ecn" # diff --git a/Shorewall/configfiles/findgw b/Shorewall/configfiles/findgw index 9581001e1..e855125e8 100644 --- a/Shorewall/configfiles/findgw +++ b/Shorewall/configfiles/findgw @@ -1,7 +1,5 @@ # -# Shorewall - Findgw File -# -# /etc/shorewall/findgw +# Shorewall -- /etc/shorewall/findgw # # The code in this file is executed when Shorewall is trying to detect the # gateway through an interface in /etc/shorewall/providers that has GATEWAY diff --git a/Shorewall/configfiles/hosts b/Shorewall/configfiles/hosts index b00b89ebd..6303d0671 100644 --- a/Shorewall/configfiles/hosts +++ b/Shorewall/configfiles/hosts @@ -1,7 +1,5 @@ # -# Shorewall - Hosts file -# -# /etc/shorewall/hosts +# Shorewall -- /etc/shorewall/hosts # # For information about entries in this file, type "man shorewall-hosts" # diff --git a/Shorewall/configfiles/init b/Shorewall/configfiles/init index 813fcf04f..417c3f2c0 100644 --- a/Shorewall/configfiles/init +++ b/Shorewall/configfiles/init @@ -1,7 +1,5 @@ # -# Shorewall - Init File -# -# /etc/shorewall/init +# Shorewall -- /etc/shorewall/init # # Add commands below that you want to be executed at the beginning of # a "shorewall start", "shorewall-reload" or "shorewall restart" command. diff --git a/Shorewall/configfiles/initdone b/Shorewall/configfiles/initdone index 2aab056b3..5ad859ab0 100644 --- a/Shorewall/configfiles/initdone +++ b/Shorewall/configfiles/initdone @@ -1,7 +1,5 @@ # -# Shorewall - Initdone File -# -# /etc/shorewall/initdone +# Shorewall -- /etc/shorewall/initdone # # Add commands below that you want to be executed during # "shorewall start", "shorewall reload" or "shorewall restart" commands diff --git a/Shorewall/configfiles/interfaces b/Shorewall/configfiles/interfaces index c8c3573d1..2f2d70e42 100644 --- a/Shorewall/configfiles/interfaces +++ b/Shorewall/configfiles/interfaces @@ -1,7 +1,5 @@ # -# Shorewall - Interfaces File -# -# /etc/shorewall/interfaces +# Shorewall -- /etc/shorewall/interfaces # # For information about entries in this file, type "man shorewall-interfaces" # diff --git a/Shorewall/configfiles/isusable b/Shorewall/configfiles/isusable index d3cda4f5d..24777d25b 100644 --- a/Shorewall/configfiles/isusable +++ b/Shorewall/configfiles/isusable @@ -1,7 +1,5 @@ # -# Shorewall - Isusable File -# -# /etc/shorewall/isusable +# Shorewall -- /etc/shorewall/isusable # # This script is called when Shorewall is attempting to determine # if an interface named in /etc/shorewall/providers is usable. diff --git a/Shorewall/configfiles/lib.private b/Shorewall/configfiles/lib.private index 76c738e49..1b617643f 100644 --- a/Shorewall/configfiles/lib.private +++ b/Shorewall/configfiles/lib.private @@ -1,7 +1,5 @@ # -# Shorewall - Lib.private File -# -# /etc/shorewall/lib.private +# Shorewall -- /etc/shorewall/lib.private # # Use this file to declare shell functions to be called in the other # run-time extension scripts. The file will be copied into the generated diff --git a/Shorewall/configfiles/maclist b/Shorewall/configfiles/maclist index 0df37a1ae..8b71e65b2 100644 --- a/Shorewall/configfiles/maclist +++ b/Shorewall/configfiles/maclist @@ -1,7 +1,5 @@ # -# Shorewall - Maclist file -# -# /etc/shorewall/maclist +# Shorewall -- /etc/shorewall/maclist # # For information about entries in this file, type "man shorewall-maclist" # diff --git a/Shorewall/configfiles/mangle b/Shorewall/configfiles/mangle index ce1310d3b..af0d9c37e 100644 --- a/Shorewall/configfiles/mangle +++ b/Shorewall/configfiles/mangle @@ -1,7 +1,5 @@ # -# Shorewall - Mangle File -# -# /etc/shorewall/mangle +# Shorewall -- /etc/shorewall/mangle # # For information about entries in this file, type "man shorewall-mangle" # diff --git a/Shorewall/configfiles/masq b/Shorewall/configfiles/masq index 2ca9ecc82..a60df5437 100644 --- a/Shorewall/configfiles/masq +++ b/Shorewall/configfiles/masq @@ -1,7 +1,5 @@ # -# Shorewall - Masq file -# -# /etc/shorewall/masq +# Shorewall -- /etc/shorewall/masq # # For information about entries in this file, type "man shorewall-masq" # diff --git a/Shorewall/configfiles/nat b/Shorewall/configfiles/nat index f72ee92b3..fa9645b60 100644 --- a/Shorewall/configfiles/nat +++ b/Shorewall/configfiles/nat @@ -1,7 +1,5 @@ # -# Shorewall - Nat File -# -# /etc/shorewall/nat +# Shorewall -- /etc/shorewall/nat # # For information about entries in this file, type "man shorewall-nat" # diff --git a/Shorewall/configfiles/netmap b/Shorewall/configfiles/netmap index 54e7fb85c..62e5dd369 100644 --- a/Shorewall/configfiles/netmap +++ b/Shorewall/configfiles/netmap @@ -1,7 +1,5 @@ # -# Shorewall - Netmap File -# -# /etc/shorewall/netmap +# Shorewall -- /etc/shorewall/netmap # # For information about entries in this file, type "man shorewall-netmap" # diff --git a/Shorewall/configfiles/params b/Shorewall/configfiles/params index 332256486..bd471a3c7 100644 --- a/Shorewall/configfiles/params +++ b/Shorewall/configfiles/params @@ -1,7 +1,5 @@ # -# Shorewall - Params File -# -# /etc/shorewall/params +# Shorewall -- /etc/shorewall/params # # Assign any variables that you need here. # diff --git a/Shorewall/configfiles/policy b/Shorewall/configfiles/policy index 0503774ba..6f99c762f 100644 --- a/Shorewall/configfiles/policy +++ b/Shorewall/configfiles/policy @@ -1,7 +1,5 @@ # -# Shorewall - Policy File -# -# /etc/shorewall/policy +# Shorewall -- /etc/shorewall/policy # # For information about entries in this file, type "man shorewall-policy" # diff --git a/Shorewall/configfiles/providers b/Shorewall/configfiles/providers index a55bfc776..0dfb950cb 100644 --- a/Shorewall/configfiles/providers +++ b/Shorewall/configfiles/providers @@ -1,7 +1,5 @@ # -# Shorewall - Providers File -# -# /etc/shorewall/providers +# Shorewall -- /etc/shorewall/providers # # For information about entries in this file, type "man shorewall-providers" # diff --git a/Shorewall/configfiles/proxyarp b/Shorewall/configfiles/proxyarp index 36adc2055..4249e03e7 100644 --- a/Shorewall/configfiles/proxyarp +++ b/Shorewall/configfiles/proxyarp @@ -1,7 +1,5 @@ # -# Shorewall - Proxyarp File -# -# /etc/shorewall/proxyarp +# Shorewall -- /etc/shorewall/proxyarp # # For information about entries in this file, type "man shorewall-proxyarp" # diff --git a/Shorewall/configfiles/refresh b/Shorewall/configfiles/refresh index 20dfe0392..77d0d8fd3 100644 --- a/Shorewall/configfiles/refresh +++ b/Shorewall/configfiles/refresh @@ -1,7 +1,5 @@ # -# Shorewall - Refresh File -# -# /etc/shorewall/refresh +# Shorewall -- /etc/shorewall/refresh # # Add commands below that you want to be executed before Shorewall # has processed the 'refresh' command. diff --git a/Shorewall/configfiles/refreshed b/Shorewall/configfiles/refreshed index 08ebaebc0..86d76fbfa 100644 --- a/Shorewall/configfiles/refreshed +++ b/Shorewall/configfiles/refreshed @@ -1,7 +1,5 @@ # -# Shorewall - Refreshed File -# -# /etc/shorewall/refreshed +# Shorewall -- /etc/shorewall/refreshed # # Add commands below that you want to be executed after Shorewall has # processed the 'refresh' command. diff --git a/Shorewall/configfiles/restored b/Shorewall/configfiles/restored index 594896eaa..4df2d0e04 100644 --- a/Shorewall/configfiles/restored +++ b/Shorewall/configfiles/restored @@ -1,7 +1,5 @@ # -# Shorewall - Restored File -# -# /etc/shorewall/restored +# Shorewall -- /etc/shorewall/restored # # Add commands below that you want to be executed after shorewall has # completed a 'restore' command. diff --git a/Shorewall/configfiles/routes b/Shorewall/configfiles/routes index 9440e8cdb..8389b0a8c 100644 --- a/Shorewall/configfiles/routes +++ b/Shorewall/configfiles/routes @@ -1,7 +1,5 @@ # -# Shorewall - Routes File -# -# /etc/shorewall/routes +# Shorewall -- /etc/shorewall/routes # # For information about entries in this file, type "man shorewall-routes" # diff --git a/Shorewall/configfiles/rtrules b/Shorewall/configfiles/rtrules index 9cde3371d..77008163d 100644 --- a/Shorewall/configfiles/rtrules +++ b/Shorewall/configfiles/rtrules @@ -1,7 +1,5 @@ # -# Shorewall - Rtrules File -# -# /etc/shorewall/rtrules +# Shorewall -- /etc/shorewall/rtrules # # For information about entries in this file, type "man shorewall-rtrules" # diff --git a/Shorewall/configfiles/rules b/Shorewall/configfiles/rules index 474e1862e..cd6ef0159 100644 --- a/Shorewall/configfiles/rules +++ b/Shorewall/configfiles/rules @@ -1,7 +1,5 @@ # -# Shorewall - Rules File -# -# /etc/shorewall/rules +# Shorewall -- /etc/shorewall/rules # # For information on the settings in this file, type "man shorewall-rules" # diff --git a/Shorewall/configfiles/scfilter b/Shorewall/configfiles/scfilter index 73da56d63..771d24218 100644 --- a/Shorewall/configfiles/scfilter +++ b/Shorewall/configfiles/scfilter @@ -1,7 +1,5 @@ # -# Shorewall - Scfilter Filter -# -# /etc/shorewall/scfilter +# Shorewall -- /etc/shorewall/scfilter # # Replace the 'cat' command below to filter the output of # 'show connections'. diff --git a/Shorewall/configfiles/secmarks b/Shorewall/configfiles/secmarks index b1b2b518e..6a3372170 100644 --- a/Shorewall/configfiles/secmarks +++ b/Shorewall/configfiles/secmarks @@ -1,7 +1,5 @@ # -# Shorewall - Secmarks File -# -# /etc/shorewall/secmarks +# Shorewall -- /etc/shorewall/secmarks # # For information about entries in this file, type "man shorewall-secmarks" # diff --git a/Shorewall/configfiles/start b/Shorewall/configfiles/start index 4f698d358..eaff0640a 100644 --- a/Shorewall/configfiles/start +++ b/Shorewall/configfiles/start @@ -1,7 +1,5 @@ # -# Shorewall - Start File -# -# /etc/shorewall/start +# Shorewall -- /etc/shorewall/start # # Add commands below that you want to be executed after shorewall has # been started, reloaded or restarted. diff --git a/Shorewall/configfiles/started b/Shorewall/configfiles/started index 2fef8a7ca..7b6adac40 100644 --- a/Shorewall/configfiles/started +++ b/Shorewall/configfiles/started @@ -1,7 +1,5 @@ # -# Shorewall - Started File -# -# /etc/shorewall/started +# Shorewall -- /etc/shorewall/started # # Add commands below that you want to be executed after shorewall has # been completely started, reloaded or restarted. The difference between diff --git a/Shorewall/configfiles/stop b/Shorewall/configfiles/stop index 7e112aeb3..27a993b08 100644 --- a/Shorewall/configfiles/stop +++ b/Shorewall/configfiles/stop @@ -1,7 +1,5 @@ # -# Shorewall - Stop File -# -# /etc/shorewall/stop +# Shorewall -- /etc/shorewall/stop # # Add commands below that you want to be executed at the beginning of a # "shorewall stop" command. diff --git a/Shorewall/configfiles/stopped b/Shorewall/configfiles/stopped index c8ca296c2..8cc6bc604 100644 --- a/Shorewall/configfiles/stopped +++ b/Shorewall/configfiles/stopped @@ -1,7 +1,5 @@ # -# Shorewall - Stopped File -# -# /etc/shorewall/stopped +# Shorewall -- /etc/shorewall/stopped # # Add commands below that you want to be executed at the completion of a # "shorewall stop" command. diff --git a/Shorewall/configfiles/stoppedrules b/Shorewall/configfiles/stoppedrules index bbe737296..09792af28 100644 --- a/Shorewall/configfiles/stoppedrules +++ b/Shorewall/configfiles/stoppedrules @@ -1,7 +1,5 @@ # -# Shorewall - Stoppedrules File -# -# /etc/shorewall/stoppedrules +# Shorewall -- /etc/shorewall/stoppedrules # # For information about entries in this file, type "man shorewall-stoppedrules" # diff --git a/Shorewall/configfiles/tcclasses b/Shorewall/configfiles/tcclasses index f2c7fbc16..8776b1aa0 100644 --- a/Shorewall/configfiles/tcclasses +++ b/Shorewall/configfiles/tcclasses @@ -1,7 +1,5 @@ # -# Shorewall - Tcclasses File -# -# /etc/shorewall/tcclasses +# Shorewall -- /etc/shorewall/tcclasses # # For information about entries in this file, type "man shorewall-tcclasses" # diff --git a/Shorewall/configfiles/tcclear b/Shorewall/configfiles/tcclear index 0436b813f..0d902b6c3 100644 --- a/Shorewall/configfiles/tcclear +++ b/Shorewall/configfiles/tcclear @@ -1,7 +1,5 @@ # -# Shorewall - Tcclear File -# -# /etc/shorewall/tcclear +# Shorewall -- /etc/shorewall/tcclear # # Add commands below that you want to be executed before Shorewall clears # the traffic shaping configuration. diff --git a/Shorewall/configfiles/tcdevices b/Shorewall/configfiles/tcdevices index 6ff0cdebf..78fbc8ae1 100644 --- a/Shorewall/configfiles/tcdevices +++ b/Shorewall/configfiles/tcdevices @@ -1,7 +1,5 @@ # -# Shorewall - Tcdevices File -# -# /etc/shorewall/tcdevices +# Shorewall -- /etc/shorewall/tcdevices # # For information about entries in this file, type "man shorewall-tcdevices" # diff --git a/Shorewall/configfiles/tcfilters b/Shorewall/configfiles/tcfilters index b6ead64b5..1d7e1fb75 100644 --- a/Shorewall/configfiles/tcfilters +++ b/Shorewall/configfiles/tcfilters @@ -1,7 +1,5 @@ # -# Shorewall - Tcfilters File -# -# /etc/shorewall/tcfilters +# Shorewall -- /etc/shorewall/tcfilters # # For information about entries in this file, type "man shorewall-tcfilters" # diff --git a/Shorewall/configfiles/tcinterfaces b/Shorewall/configfiles/tcinterfaces index 15cd39b67..4026bc242 100644 --- a/Shorewall/configfiles/tcinterfaces +++ b/Shorewall/configfiles/tcinterfaces @@ -1,7 +1,5 @@ # -# Shorewall - Tcinterfaces File -# -# /etc/shorewall/tcinterfaces +# Shorewall -- /etc/shorewall/tcinterfaces # # For information about entries in this file, type "man shorewall-tcinterfaces" # diff --git a/Shorewall/configfiles/tcpri b/Shorewall/configfiles/tcpri index 89520931b..c3d9acc9c 100644 --- a/Shorewall/configfiles/tcpri +++ b/Shorewall/configfiles/tcpri @@ -1,7 +1,5 @@ # -# Shorewall - Tcpri File -# -# /etc/shorewall/tcpri +# Shorewall -- /etc/shorewall/tcpri # # For information about entries in this file, type "man shorewall-tcpri" # diff --git a/Shorewall/configfiles/tunnels b/Shorewall/configfiles/tunnels index 2bafc7282..73eed6a57 100644 --- a/Shorewall/configfiles/tunnels +++ b/Shorewall/configfiles/tunnels @@ -1,7 +1,5 @@ # -# Shorewall - Tunnels File -# -# /etc/shorewall/tunnels +# Shorewall -- /etc/shorewall/tunnels # # For information about entries in this file, type "man shorewall-tunnels" # diff --git a/Shorewall/configfiles/zones b/Shorewall/configfiles/zones index 31197da85..7cdc765f8 100644 --- a/Shorewall/configfiles/zones +++ b/Shorewall/configfiles/zones @@ -1,7 +1,5 @@ # -# Shorewall - Zones File -# -# /etc/shorewall/zones +# Shorewall -- /etc/shorewall/zones # # For information about this file, type "man shorewall-zones" # From d0d34568d1e046e35c6282ff6357f47dfdb50d73 Mon Sep 17 00:00:00 2001 From: Tuomo Soini Date: Mon, 9 Nov 2015 23:09:37 +0200 Subject: [PATCH 5/5] Shorewall6: reduce number of lines on config headers Signed-off-by: Tuomo Soini --- Shorewall6/configfiles/accounting | 4 +--- Shorewall6/configfiles/actions | 4 +--- Shorewall6/configfiles/blrules | 4 +--- Shorewall6/configfiles/clear | 4 +--- Shorewall6/configfiles/conntrack | 4 +--- Shorewall6/configfiles/findgw | 4 +--- Shorewall6/configfiles/hosts | 4 +--- Shorewall6/configfiles/init | 4 +--- Shorewall6/configfiles/interfaces | 4 +--- Shorewall6/configfiles/isusable | 4 +--- Shorewall6/configfiles/lib.private | 4 +--- Shorewall6/configfiles/maclist | 4 +--- Shorewall6/configfiles/mangle | 4 +--- Shorewall6/configfiles/masq | 4 +--- Shorewall6/configfiles/nat | 4 +--- Shorewall6/configfiles/netmap | 4 +--- Shorewall6/configfiles/params | 4 +--- Shorewall6/configfiles/policy | 4 +--- Shorewall6/configfiles/providers | 4 +--- Shorewall6/configfiles/proxyndp | 4 +--- Shorewall6/configfiles/refresh | 4 +--- Shorewall6/configfiles/refreshed | 4 +--- Shorewall6/configfiles/restored | 4 +--- Shorewall6/configfiles/routes | 4 +--- Shorewall6/configfiles/rtrules | 4 +--- Shorewall6/configfiles/rules | 4 +--- Shorewall6/configfiles/scfilter | 4 +--- Shorewall6/configfiles/secmarks | 4 +--- Shorewall6/configfiles/start | 4 +--- Shorewall6/configfiles/started | 4 +--- Shorewall6/configfiles/stop | 4 +--- Shorewall6/configfiles/stopped | 4 +--- Shorewall6/configfiles/stoppedrules | 4 +--- Shorewall6/configfiles/tcclasses | 4 +--- Shorewall6/configfiles/tcclear | 4 +--- Shorewall6/configfiles/tcdevices | 4 +--- Shorewall6/configfiles/tcfilters | 4 +--- Shorewall6/configfiles/tcinterfaces | 4 +--- Shorewall6/configfiles/tcpri | 4 +--- Shorewall6/configfiles/tunnels | 4 +--- Shorewall6/configfiles/zones | 4 +--- 41 files changed, 41 insertions(+), 123 deletions(-) diff --git a/Shorewall6/configfiles/accounting b/Shorewall6/configfiles/accounting index bd61bde6c..341d10cb6 100644 --- a/Shorewall6/configfiles/accounting +++ b/Shorewall6/configfiles/accounting @@ -1,7 +1,5 @@ # -# Shorewall6 - Accounting File -# -# /etc/shorewall6/accounting +# Shorewall6 -- /etc/shorewall6/accounting # # For information about entries in this file, type "man shorewall6-accounting" # diff --git a/Shorewall6/configfiles/actions b/Shorewall6/configfiles/actions index aeea3c6d1..490af22b0 100644 --- a/Shorewall6/configfiles/actions +++ b/Shorewall6/configfiles/actions @@ -1,7 +1,5 @@ # -# Shorewall6 - Actions File -# -# /etc/shorewall6/actions +# Shorewall6 -- /etc/shorewall6/actions # # For information about entries in this file, type "man shorewall6-actions" # diff --git a/Shorewall6/configfiles/blrules b/Shorewall6/configfiles/blrules index 34fa70331..580cf9ff4 100644 --- a/Shorewall6/configfiles/blrules +++ b/Shorewall6/configfiles/blrules @@ -1,7 +1,5 @@ # -# Shorewall6 - Blrules File -# -# /etc/shorewall6/blrules +# Shorewall6 -- /etc/shorewall6/blrules # # For information about entries in this file, type "man shorewall6-blrules" # diff --git a/Shorewall6/configfiles/clear b/Shorewall6/configfiles/clear index 349c2b737..d14c9ad6b 100644 --- a/Shorewall6/configfiles/clear +++ b/Shorewall6/configfiles/clear @@ -1,7 +1,5 @@ # -# Shorewall6 - Clear File -# -# /etc/shorewall6/clear +# Shorewall6 -- /etc/shorewall6/clear # # Add commands below that you want to be executed after Shorewall6 has # processed the 'clear' command. diff --git a/Shorewall6/configfiles/conntrack b/Shorewall6/configfiles/conntrack index 1fff3114c..fa68823d7 100644 --- a/Shorewall6/configfiles/conntrack +++ b/Shorewall6/configfiles/conntrack @@ -1,7 +1,5 @@ # -# Shorewall6 - Conntrack File -# -# /etc/shorewall6/conntrack +# Shorewall6 -- /etc/shorewall6/conntrack # # For information about entries in this file, type "man shorewall6-conntrack" # diff --git a/Shorewall6/configfiles/findgw b/Shorewall6/configfiles/findgw index d3b4a3c73..e35549e63 100644 --- a/Shorewall6/configfiles/findgw +++ b/Shorewall6/configfiles/findgw @@ -1,7 +1,5 @@ # -# Shorewall6 - Findgw File -# -# /etc/shorewall6/findgw +# Shorewall6 -- /etc/shorewall6/findgw # # The code in this file is executed when Shorewall is trying to detect the # gateway through an interface in /etc/shorewall6/providers that has GATEWAY diff --git a/Shorewall6/configfiles/hosts b/Shorewall6/configfiles/hosts index 8bd10b1e2..17ec5e201 100644 --- a/Shorewall6/configfiles/hosts +++ b/Shorewall6/configfiles/hosts @@ -1,7 +1,5 @@ # -# Shorewall6 - Hosts file -# -# /etc/shorewall6/hosts +# Shorewall6 -- /etc/shorewall6/hosts # # For information about entries in this file, type "man shorewall6-hosts" # diff --git a/Shorewall6/configfiles/init b/Shorewall6/configfiles/init index 5e59d1203..eaeb3105b 100644 --- a/Shorewall6/configfiles/init +++ b/Shorewall6/configfiles/init @@ -1,7 +1,5 @@ # -# Shorewall6 - Init File -# -# /etc/shorewall6/init +# Shorewall6 -- /etc/shorewall6/init # # Add commands below that you want to be executed at the beginning of # a "shorewall6 start" or "shorewall6 restart" command. diff --git a/Shorewall6/configfiles/interfaces b/Shorewall6/configfiles/interfaces index 2b1e2f283..75b82e71f 100644 --- a/Shorewall6/configfiles/interfaces +++ b/Shorewall6/configfiles/interfaces @@ -1,7 +1,5 @@ # -# Shorewall6 - Interfaces File -# -# /etc/shorewall6/interfaces +# Shorewall6 -- /etc/shorewall6/interfaces # # For information about entries in this file, type "man shorewall6-interfaces" # diff --git a/Shorewall6/configfiles/isusable b/Shorewall6/configfiles/isusable index 96b0831b5..fdfacfeee 100644 --- a/Shorewall6/configfiles/isusable +++ b/Shorewall6/configfiles/isusable @@ -1,7 +1,5 @@ # -# Shorewall6 - Isusable File -# -# /etc/shorewall6/isusable +# Shorewall6 -- /etc/shorewall6/isusable # # This script is called when Shorewall6 is attempting to determine # if an interface named in /etc/shorewall6/providers is usable. diff --git a/Shorewall6/configfiles/lib.private b/Shorewall6/configfiles/lib.private index 4848af382..4df3fd9dd 100644 --- a/Shorewall6/configfiles/lib.private +++ b/Shorewall6/configfiles/lib.private @@ -1,7 +1,5 @@ # -# Shorewall6 - Lib.private File -# -# /etc/shorewall6/lib.private +# Shorewall6 -- /etc/shorewall6/lib.private # # Use this file to declare shell functions to be called in the other # run-time extension scripts. The file will be copied into the generated diff --git a/Shorewall6/configfiles/maclist b/Shorewall6/configfiles/maclist index 1fafd9e49..78080e721 100644 --- a/Shorewall6/configfiles/maclist +++ b/Shorewall6/configfiles/maclist @@ -1,7 +1,5 @@ # -# Shorewall6 - Maclist file -# -# /etc/shorewall6/maclist +# Shorewall6 -- /etc/shorewall6/maclist # # For information about entries in this file, type "man shorewall6-maclist" # diff --git a/Shorewall6/configfiles/mangle b/Shorewall6/configfiles/mangle index a93fc7aaf..175e5165f 100644 --- a/Shorewall6/configfiles/mangle +++ b/Shorewall6/configfiles/mangle @@ -1,7 +1,5 @@ # -# Shorewall6 - Mangle File -# -# /etc/shorewall6/mangle +# Shorewall6 -- /etc/shorewall6/mangle # # For information about entries in this file, type "man shorewall6-mangle" # diff --git a/Shorewall6/configfiles/masq b/Shorewall6/configfiles/masq index 464a23462..130b2743a 100644 --- a/Shorewall6/configfiles/masq +++ b/Shorewall6/configfiles/masq @@ -1,7 +1,5 @@ # -# Shorewall6 - Masq file -# -# /etc/shorewall6/masq +# Shorewall6 -- /etc/shorewall6/masq # # For information about entries in this file, type "man shorewall6-masq" # diff --git a/Shorewall6/configfiles/nat b/Shorewall6/configfiles/nat index cfab54dc3..f790be45a 100644 --- a/Shorewall6/configfiles/nat +++ b/Shorewall6/configfiles/nat @@ -1,7 +1,5 @@ # -# Shorewall6 - Nat File -# -# /etc/shorewall6/nat +# Shorewall6 -- /etc/shorewall6/nat # # For information about entries in this file, type "man shorewall6-nat" # diff --git a/Shorewall6/configfiles/netmap b/Shorewall6/configfiles/netmap index f59c9845a..d055c98d3 100644 --- a/Shorewall6/configfiles/netmap +++ b/Shorewall6/configfiles/netmap @@ -1,7 +1,5 @@ # -# Shorewall6 - Netmap File -# -# /etc/shorewall6/netmap +# Shorewall6 -- /etc/shorewall6/netmap # # For information about entries in this file, type "man shorewall-netmap" # diff --git a/Shorewall6/configfiles/params b/Shorewall6/configfiles/params index 0cd5087b8..96481e186 100644 --- a/Shorewall6/configfiles/params +++ b/Shorewall6/configfiles/params @@ -1,7 +1,5 @@ # -# Shorewall6 - Params File -# -# /etc/shorewall6/params +# Shorewall6 -- /etc/shorewall6/params # # Assign any variables that you need here. # diff --git a/Shorewall6/configfiles/policy b/Shorewall6/configfiles/policy index 41dbd5e6a..23121180c 100644 --- a/Shorewall6/configfiles/policy +++ b/Shorewall6/configfiles/policy @@ -1,7 +1,5 @@ # -# Shorewall6 - Policy File -# -# /etc/shorewall6/policy +# Shorewall6 -- /etc/shorewall6/policy # # For information about entries in this file, type "man shorewall6-policy" # diff --git a/Shorewall6/configfiles/providers b/Shorewall6/configfiles/providers index 685061c22..8d503f26f 100644 --- a/Shorewall6/configfiles/providers +++ b/Shorewall6/configfiles/providers @@ -1,7 +1,5 @@ # -# Shorewall6 - Providers File -# -# /etc/shorewall6/providers +# Shorewall6 -- /etc/shorewall6/providers # # For information about entries in this file, type "man shorewall6-providers" # diff --git a/Shorewall6/configfiles/proxyndp b/Shorewall6/configfiles/proxyndp index b2f0a3bff..9fd002c98 100644 --- a/Shorewall6/configfiles/proxyndp +++ b/Shorewall6/configfiles/proxyndp @@ -1,7 +1,5 @@ # -# Shorewall6 - Proxyndp File -# -# /etc/shorewall6/proxyndp +# Shorewall6 -- /etc/shorewall6/proxyndp # # For information about entries in this file, type "man shorewall6-proxyndp" # diff --git a/Shorewall6/configfiles/refresh b/Shorewall6/configfiles/refresh index be74a17ef..f89afe40e 100644 --- a/Shorewall6/configfiles/refresh +++ b/Shorewall6/configfiles/refresh @@ -1,7 +1,5 @@ # -# Shorewall6 - Refresh File -# -# /etc/shorewall6/refresh +# Shorewall6 -- /etc/shorewall6/refresh # # Add commands below that you want to be executed before Shorewall6 has # processed the 'refresh' command. diff --git a/Shorewall6/configfiles/refreshed b/Shorewall6/configfiles/refreshed index 070941dc9..f7f453c2e 100644 --- a/Shorewall6/configfiles/refreshed +++ b/Shorewall6/configfiles/refreshed @@ -1,7 +1,5 @@ # -# Shorewall6 - Refreshed File -# -# /etc/shorewall6/refreshed +# Shorewall6 -- /etc/shorewall6/refreshed # # Add commands below that you want to be executed after Shorewall6 has # processed the 'refresh' command. diff --git a/Shorewall6/configfiles/restored b/Shorewall6/configfiles/restored index 50a367726..d098e1a92 100644 --- a/Shorewall6/configfiles/restored +++ b/Shorewall6/configfiles/restored @@ -1,7 +1,5 @@ # -# Shorewall6 - Restored File -# -# /etc/shorewall6/restored +# Shorewall6 -- /etc/shorewall6/restored # # Add commands below that you want to be executed after shorewall6 has # completed a 'restore' command. diff --git a/Shorewall6/configfiles/routes b/Shorewall6/configfiles/routes index 63e9212d3..564f6c5b3 100644 --- a/Shorewall6/configfiles/routes +++ b/Shorewall6/configfiles/routes @@ -1,7 +1,5 @@ # -# Shorewall6 - Routes File -# -# /etc/shorewall6/routes +# Shorewall6 -- /etc/shorewall6/routes # # For information about entries in this file, type "man shorewall6-routes" # diff --git a/Shorewall6/configfiles/rtrules b/Shorewall6/configfiles/rtrules index d384a1ded..8edcb6300 100644 --- a/Shorewall6/configfiles/rtrules +++ b/Shorewall6/configfiles/rtrules @@ -1,7 +1,5 @@ # -# Shorewall6 - Rtrules File -# -# /etc/shorewall6/rtrules +# Shorewall6 -- /etc/shorewall6/rtrules # # For information about entries in this file, type "man shorewall6-rtrules" # diff --git a/Shorewall6/configfiles/rules b/Shorewall6/configfiles/rules index d717947a1..d813661e3 100644 --- a/Shorewall6/configfiles/rules +++ b/Shorewall6/configfiles/rules @@ -1,7 +1,5 @@ # -# Shorewall6 - Rules File -# -# /etc/shorewall6/rules +# Shorewall6 -- /etc/shorewall6/rules # # For information on the settings in this file, type "man shorewall6-rules" # diff --git a/Shorewall6/configfiles/scfilter b/Shorewall6/configfiles/scfilter index e8c97cdbf..ae890bce7 100644 --- a/Shorewall6/configfiles/scfilter +++ b/Shorewall6/configfiles/scfilter @@ -1,7 +1,5 @@ # -# Shorewall6 - Scfilter File -# -# /etc/shorewall6/scfilter +# Shorewall6 -- /etc/shorewall6/scfilter # # Replace the 'cat' command below to filter the output of # 'show connections'. diff --git a/Shorewall6/configfiles/secmarks b/Shorewall6/configfiles/secmarks index 31569730d..6c2108695 100644 --- a/Shorewall6/configfiles/secmarks +++ b/Shorewall6/configfiles/secmarks @@ -1,7 +1,5 @@ # -# Shorewall6 - Secmarks File -# -# /etc/shorewall6/secmarks +# Shorewall6 -- /etc/shorewall6/secmarks # # For information about entries in this file, type "man shorewall-secmarks" # diff --git a/Shorewall6/configfiles/start b/Shorewall6/configfiles/start index 757f5d71c..6007330d6 100644 --- a/Shorewall6/configfiles/start +++ b/Shorewall6/configfiles/start @@ -1,7 +1,5 @@ # -# Shorewall6 - Start File -# -# /etc/shorewall6/start +# Shorewall6 -- /etc/shorewall6/start # # Add commands below that you want to be executed after shorewall6 has # been started or restarted. diff --git a/Shorewall6/configfiles/started b/Shorewall6/configfiles/started index 7cc956da2..1c2f9c694 100644 --- a/Shorewall6/configfiles/started +++ b/Shorewall6/configfiles/started @@ -1,7 +1,5 @@ # -# Shorewall6 - Started File -# -# /etc/shorewall6/started +# Shorewall6 -- /etc/shorewall6/started # # Add commands below that you want to be executed after shorewall6 has # been completely started or restarted. The difference between this diff --git a/Shorewall6/configfiles/stop b/Shorewall6/configfiles/stop index dcc41295d..87bf2ac71 100644 --- a/Shorewall6/configfiles/stop +++ b/Shorewall6/configfiles/stop @@ -1,7 +1,5 @@ # -# Shorewall6 - Stop File -# -# /etc/shorewall6/stop +# Shorewall6 -- /etc/shorewall6/stop # # Add commands below that you want to be executed at the beginning of a # "shorewall6 stop" command. diff --git a/Shorewall6/configfiles/stopped b/Shorewall6/configfiles/stopped index 14e0e31dd..91fde2624 100644 --- a/Shorewall6/configfiles/stopped +++ b/Shorewall6/configfiles/stopped @@ -1,7 +1,5 @@ # -# Shorewall6 - Stopped File -# -# /etc/shorewall6/stopped +# Shorewall6 -- /etc/shorewall6/stopped # # Add commands below that you want to be executed at the completion of a # "shorewall6 stop" command. diff --git a/Shorewall6/configfiles/stoppedrules b/Shorewall6/configfiles/stoppedrules index c773bace7..f68cb0738 100644 --- a/Shorewall6/configfiles/stoppedrules +++ b/Shorewall6/configfiles/stoppedrules @@ -1,7 +1,5 @@ # -# Shorewall6 - Stoppedrules File -# -# /etc/shorewall6/stoppedrules +# Shorewall6 -- /etc/shorewall6/stoppedrules # # For information about entries in this file, # type "man shorewall6-stoppedrules" diff --git a/Shorewall6/configfiles/tcclasses b/Shorewall6/configfiles/tcclasses index 4a96af64c..e461fbb15 100644 --- a/Shorewall6/configfiles/tcclasses +++ b/Shorewall6/configfiles/tcclasses @@ -1,7 +1,5 @@ # -# Shorewall6 - Tcclasses File -# -# /etc/shorewall6/tcclasses +# Shorewall6 -- /etc/shorewall6/tcclasses # # For information about entries in this file, type "man shorewall6-tcclasses" # diff --git a/Shorewall6/configfiles/tcclear b/Shorewall6/configfiles/tcclear index e75b48c16..2fdd8a63a 100644 --- a/Shorewall6/configfiles/tcclear +++ b/Shorewall6/configfiles/tcclear @@ -1,7 +1,5 @@ # -# Shorewall6 - tcclear File -# -# /etc/shorewall6/tcclear +# Shorewall6 -- /etc/shorewall6/tcclear # # Add commands below that you want to be executed before Shorewall6 clears # the traffic shaping configuration. diff --git a/Shorewall6/configfiles/tcdevices b/Shorewall6/configfiles/tcdevices index 8e48c1113..517ff4193 100644 --- a/Shorewall6/configfiles/tcdevices +++ b/Shorewall6/configfiles/tcdevices @@ -1,7 +1,5 @@ # -# Shorewall6 - Tcdevices File -# -# /etc/shorewall6/tcdevices +# Shorewall6 -- /etc/shorewall6/tcdevices # # For information about entries in this file, type "man shorewall6-tcdevices" # diff --git a/Shorewall6/configfiles/tcfilters b/Shorewall6/configfiles/tcfilters index 7b61e0edb..6f82a51ad 100644 --- a/Shorewall6/configfiles/tcfilters +++ b/Shorewall6/configfiles/tcfilters @@ -1,7 +1,5 @@ # -# Shorewall6 - Tcfilters File -# -# /etc/shorewall6/tcfilters +# Shorewall6 -- /etc/shorewall6/tcfilters # # For information about entries in this file, type "man shorewall6-tcfilters" # diff --git a/Shorewall6/configfiles/tcinterfaces b/Shorewall6/configfiles/tcinterfaces index 174fc60df..d9079888d 100644 --- a/Shorewall6/configfiles/tcinterfaces +++ b/Shorewall6/configfiles/tcinterfaces @@ -1,7 +1,5 @@ # -# Shorewall6 - Tcinterfaces File -# -# /etc/shorewall6/tcinterfaces +# Shorewall6 -- /etc/shorewall6/tcinterfaces # # For information about entries in this file, # type "man shorewall6-tcinterfaces" diff --git a/Shorewall6/configfiles/tcpri b/Shorewall6/configfiles/tcpri index 53bef89ca..c4ee6e075 100644 --- a/Shorewall6/configfiles/tcpri +++ b/Shorewall6/configfiles/tcpri @@ -1,7 +1,5 @@ # -# Shorewall6 - Tcpri File -# -# /etc/shorewall6/tcpri +# Shorewall6 -- /etc/shorewall6/tcpri # # For information about entries in this file, type "man shorewall6-tcpri" # diff --git a/Shorewall6/configfiles/tunnels b/Shorewall6/configfiles/tunnels index 9733168b4..a74c51891 100644 --- a/Shorewall6/configfiles/tunnels +++ b/Shorewall6/configfiles/tunnels @@ -1,7 +1,5 @@ # -# Shorewall6 - Tunnels File -# -# /etc/shorewall6/tunnels +# Shorewall6 -- /etc/shorewall6/tunnels # # For information about entries in this file, type "man shorewall6-tunnels" # diff --git a/Shorewall6/configfiles/zones b/Shorewall6/configfiles/zones index 4a848471c..7a1e40670 100644 --- a/Shorewall6/configfiles/zones +++ b/Shorewall6/configfiles/zones @@ -1,7 +1,5 @@ # -# Shorewall6 - Zones File -# -# /etc/shorewall6/zones +# Shorewall6 -- /etc/shorewall6/zones # # For information about this file, type "man shorewall6-zones" #