diff --git a/Samples/one-interface/interfaces b/Samples/one-interface/interfaces index a8054b7f5..5ed9b8a1a 100644 --- a/Samples/one-interface/interfaces +++ b/Samples/one-interface/interfaces @@ -1,5 +1,5 @@ # -# Shorewall version 3.4 - Sample Interfaces File for one-interface configuration. +# Shorewall version 4.0 - Sample Interfaces File for one-interface configuration. # Copyright (C) 2006 by the Shorewall Team # # This library is free software; you can redistribute it and/or diff --git a/Samples/one-interface/policy b/Samples/one-interface/policy index 4e4577746..834a30591 100644 --- a/Samples/one-interface/policy +++ b/Samples/one-interface/policy @@ -1,5 +1,5 @@ # -# Shorewall version 3.4 - Sample Policy File for one-interface configuration. +# Shorewall version 4.0 - Sample Policy File for one-interface configuration. # Copyright (C) 2006 by the Shorewall Team # # This library is free software; you can redistribute it and/or diff --git a/Samples/one-interface/rules b/Samples/one-interface/rules index e667d6e4a..8b1bfbf93 100644 --- a/Samples/one-interface/rules +++ b/Samples/one-interface/rules @@ -1,5 +1,5 @@ # -# Shorewall version 3.4 - Sample Rules File for one-interface configuration. +# Shorewall version 4.0 - Sample Rules File for one-interface configuration. # Copyright (C) 2006 by the Shorewall Team # # This library is free software; you can redistribute it and/or @@ -14,7 +14,7 @@ # For more information, see http://www.shorewall.net/Documentation.htm#Zones # ############################################################################################################# -#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ +#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ MARK # PORT PORT(S) DEST LIMIT GROUP # Reject Ping from the "bad" net zone.. and prevent your log from being flooded.. diff --git a/Samples/one-interface/shorewall.conf b/Samples/one-interface/shorewall.conf index 775e9445b..a4da8b09c 100644 --- a/Samples/one-interface/shorewall.conf +++ b/Samples/one-interface/shorewall.conf @@ -26,6 +26,13 @@ STARTUP_ENABLED=No VERBOSITY=1 +############################################################################### +# C O M P I L E R +# (setting this to 'perl' requires installation of Shorewall-perl) +############################################################################### + +SHOREWALL_COMPILER= + ############################################################################### # L O G G I N G ############################################################################### @@ -74,6 +81,8 @@ RESTOREFILE= IPSECFILE=zones +LOCKFILE= + ############################################################################### # D E F A U L T A C T I O N S / M A C R O S ############################################################################### @@ -83,6 +92,13 @@ REJECT_DEFAULT="Reject" ACCEPT_DEFAULT="none" QUEUE_DEFAULT="none" +############################################################################### +# R S H / R C P C O M M A N D S +############################################################################### + +RSH_COMMAND='ssh ${root}@${system} ${command}' +RCP_COMMAND='scp ${files} ${root}@${system}:${destination}' + ############################################################################### # F I R E W A L L O P T I O N S ############################################################################### diff --git a/Samples/one-interface/zones b/Samples/one-interface/zones index 1ff5c7f3a..5c04ed20a 100644 --- a/Samples/one-interface/zones +++ b/Samples/one-interface/zones @@ -1,5 +1,5 @@ # -# Shorewall version 3.4 - Sample Zones File for one-interface configuration. +# Shorewall version 4.0 - Sample Zones File for one-interface configuration. # Copyright (C) 2006 by the Shorewall Team # # This library is free software; you can redistribute it and/or diff --git a/Samples/three-interfaces/interfaces b/Samples/three-interfaces/interfaces index 34274a4b1..b1289cb44 100644 --- a/Samples/three-interfaces/interfaces +++ b/Samples/three-interfaces/interfaces @@ -1,5 +1,5 @@ # -# Shorewall version 3.4 - Sample Interfaces File for three-interface configuration. +# Shorewall version 4.0 - Sample Interfaces File for three-interface configuration. # Copyright (C) 2006 by the Shorewall Team # # This library is free software; you can redistribute it and/or diff --git a/Samples/three-interfaces/masq b/Samples/three-interfaces/masq index c35f87ec4..90ccaf412 100644 --- a/Samples/three-interfaces/masq +++ b/Samples/three-interfaces/masq @@ -1,6 +1,6 @@ # # Shorewall version 3.4 - Sample Masq file for three-interface configuration. -# Copyright (C) 2006 by the Shorewall Team +# Copyright (C) 2006,2007 by the Shorewall Team # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -14,7 +14,7 @@ # For additional information, see http://shorewall.net/Documentation.htm#Masq # ############################################################################## -#INTERFACE SUBNET ADDRESS PROTO PORT(S) IPSEC +#INTERFACE SUBNET ADDRESS PROTO PORT(S) IPSEC MARK eth0 eth1 eth0 eth2 #LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE diff --git a/Samples/three-interfaces/routestopped b/Samples/three-interfaces/routestopped index c69a0287b..57b6ef11a 100644 --- a/Samples/three-interfaces/routestopped +++ b/Samples/three-interfaces/routestopped @@ -1,5 +1,5 @@ # -# Shorewall version 3.4 - Sample Routestopped File for three-interface configuration. +# Shorewall version 4.0 - Sample Routestopped File for three-interface configuration. # Copyright (C) 2006 by the Shorewall Team # # This library is free software; you can redistribute it and/or diff --git a/Samples/three-interfaces/rules b/Samples/three-interfaces/rules index 1399ea5b7..e626e2d1b 100644 --- a/Samples/three-interfaces/rules +++ b/Samples/three-interfaces/rules @@ -1,6 +1,6 @@ # -# Shorewall version 3.4 - Sample Rules File for three-interface configuration. -# Copyright (C) 2006 by the Shorewall Team +# Shorewall version 4.0 - Sample Rules File for three-interface configuration. +# Copyright (C) 2006,2007 by the Shorewall Team # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -14,7 +14,7 @@ # For additional information, see http://shorewall.net/Documentation.htm#Rules # ############################################################################################################# -#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ +#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ MARK # PORT PORT(S) DEST LIMIT GROUP # # Accept DNS connections from the firewall to the Internet diff --git a/Samples/three-interfaces/shorewall.conf b/Samples/three-interfaces/shorewall.conf index 0a911bb9b..0ab3a8807 100644 --- a/Samples/three-interfaces/shorewall.conf +++ b/Samples/three-interfaces/shorewall.conf @@ -1,6 +1,6 @@ ############################################################################### # -# Shorewall version 3.4 - Sample shorewall.conf for three-interface +# Shorewall version 4.0 - Sample shorewall.conf for three-interface # configuration. # Copyright (C) 2006 by the Shorewall Team # @@ -27,6 +27,13 @@ STARTUP_ENABLED=No VERBOSITY=1 +############################################################################### +# C O M P I L E R +# (setting this to 'perl' requires installation of Shorewall-perl) +############################################################################### + +SHOREWALL_COMPILER= + ############################################################################### # L O G G I N G ############################################################################### @@ -75,6 +82,8 @@ RESTOREFILE= IPSECFILE=zones +LOCKFILE= + ############################################################################### # D E F A U L T A C T I O N S / M A C R O S ############################################################################### @@ -84,6 +93,13 @@ REJECT_DEFAULT="Reject" ACCEPT_DEFAULT="none" QUEUE_DEFAULT="none" +############################################################################### +# R S H / R C P C O M M A N D S +############################################################################### + +RSH_COMMAND='ssh ${root}@${system} ${command}' +RCP_COMMAND='scp ${files} ${root}@${system}:${destination}' + ############################################################################### # F I R E W A L L O P T I O N S ############################################################################### diff --git a/Samples/three-interfaces/zones b/Samples/three-interfaces/zones index 3e1cff505..a1cfde9e2 100644 --- a/Samples/three-interfaces/zones +++ b/Samples/three-interfaces/zones @@ -1,5 +1,5 @@ # -# Shorewall version 3.4 - Sample Zones File for three-interface configuration. +# Shorewall version 4.0 - Sample Zones File for three-interface configuration. # Copyright (C) 2006 by the Shorewall Team # # This library is free software; you can redistribute it and/or diff --git a/Samples/two-interfaces/interfaces b/Samples/two-interfaces/interfaces index ab88a323f..904590118 100644 --- a/Samples/two-interfaces/interfaces +++ b/Samples/two-interfaces/interfaces @@ -1,5 +1,5 @@ # -# Shorewall version 3.4 - Sample Interfaces File for two-interface configuration. +# Shorewall version 4.0 - Sample Interfaces File for two-interface configuration. # Copyright (C) 2006 by the Shorewall Team # # This library is free software; you can redistribute it and/or diff --git a/Samples/two-interfaces/masq b/Samples/two-interfaces/masq index 2c43ec64b..cefa4543e 100644 --- a/Samples/two-interfaces/masq +++ b/Samples/two-interfaces/masq @@ -1,5 +1,5 @@ # -# Shorewall version 3.4 - Sample Masq file for two-interface configuration. +# Shorewall version 4.0 - Sample Masq file for two-interface configuration. # Copyright (C) 2006 by the Shorewall Team # # This library is free software; you can redistribute it and/or @@ -14,6 +14,6 @@ # For additional information, see http://shorewall.net/Documentation.htm#Masq # ############################################################################### -#INTERFACE SUBNET ADDRESS PROTO PORT(S) IPSEC +#INTERFACE SUBNET ADDRESS PROTO PORT(S) IPSEC MARK eth0 eth1 #LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE diff --git a/Samples/two-interfaces/policy b/Samples/two-interfaces/policy index 9a1a22b2d..5093ffab0 100644 --- a/Samples/two-interfaces/policy +++ b/Samples/two-interfaces/policy @@ -1,5 +1,5 @@ # -# Shorewall version 3.4 - Sample Policy File for two-interface configuration. +# Shorewall version 4.0 - Sample Policy File for two-interface configuration. # Copyright (C) 2006 by the Shorewall Team # # This library is free software; you can redistribute it and/or diff --git a/Samples/two-interfaces/routestopped b/Samples/two-interfaces/routestopped index db0f91922..44945cdcf 100644 --- a/Samples/two-interfaces/routestopped +++ b/Samples/two-interfaces/routestopped @@ -1,5 +1,5 @@ # -# Shorewall version 3.4 - Sample Routestopped File for two-interface configuration. +# Shorewall version 4.0 - Sample Routestopped File for two-interface configuration. # Copyright (C) 2006 by the Shorewall Team # # This library is free software; you can redistribute it and/or diff --git a/Samples/two-interfaces/rules b/Samples/two-interfaces/rules index caec9cb11..4a26c523d 100644 --- a/Samples/two-interfaces/rules +++ b/Samples/two-interfaces/rules @@ -1,6 +1,6 @@ # -# Shorewall version 3.4 - Sample Rules File for two-interface configuration. -# Copyright (C) 2006 by the Shorewall Team +# Shorewall version 4.0 - Sample Rules File for two-interface configuration. +# Copyright (C) 2006,2007 by the Shorewall Team # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -14,9 +14,8 @@ # For more information, see http://www.shorewall.net/Documentation.htm#Rules # ############################################################################################################# -#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ +#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ MARK # PORT PORT(S) DEST LIMIT GROUP -# PORT PORT(S) DEST LIMIT GROUP # # Accept DNS connections from the firewall to the network # diff --git a/Samples/two-interfaces/shorewall.conf b/Samples/two-interfaces/shorewall.conf index 37ae98efe..c70e76c36 100644 --- a/Samples/two-interfaces/shorewall.conf +++ b/Samples/two-interfaces/shorewall.conf @@ -1,7 +1,7 @@ ############################################################################### # -# Shorewall version 3.4 - Sample shorewall.conf for two-interface configuration. -# Copyright (C) 2006 by the Shorewall Team +# Shorewall version 4.0 - Sample shorewall.conf for two-interface configuration. +# Copyright (C) 2006,2007 by the Shorewall Team # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -26,6 +26,13 @@ STARTUP_ENABLED=No VERBOSITY=1 +############################################################################### +# C O M P I L E R +# (setting this to 'perl' requires installation of Shorewall-perl) +############################################################################### + +SHOREWALL_COMPILER= + ############################################################################### # L O G G I N G ############################################################################### @@ -74,6 +81,8 @@ RESTOREFILE= IPSECFILE=zones +LOCKFILE= + ############################################################################### # D E F A U L T A C T I O N S / M A C R O S ############################################################################### @@ -83,6 +92,13 @@ REJECT_DEFAULT="Reject" ACCEPT_DEFAULT="none" QUEUE_DEFAULT="none" +############################################################################### +# R S H / R C P C O M M A N D S +############################################################################### + +RSH_COMMAND='ssh ${root}@${system} ${command}' +RCP_COMMAND='scp ${files} ${root}@${system}:${destination}' + ############################################################################### # F I R E W A L L O P T I O N S ############################################################################### diff --git a/Samples/two-interfaces/zones b/Samples/two-interfaces/zones index a5ba1e58e..89c296037 100644 --- a/Samples/two-interfaces/zones +++ b/Samples/two-interfaces/zones @@ -1,5 +1,5 @@ # -# Shorewall version 3.4 - Sample Zones File for two-interface configuration. +# Shorewall version 4.0 - Sample Zones File for two-interface configuration. # Copyright (C) 2006 by the Shorewall Team # # This library is free software; you can redistribute it and/or