From c566c907a31b8142b2f2570210b9547c22af5326 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 13 Sep 2011 22:31:30 -0300 Subject: Adding tunnel boilerplate --- files/boilerplate/tunnel.footer | 1 + files/boilerplate/tunnel.header | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 files/boilerplate/tunnel.footer create mode 100644 files/boilerplate/tunnel.header (limited to 'files') diff --git a/files/boilerplate/tunnel.footer b/files/boilerplate/tunnel.footer new file mode 100644 index 0000000..5e12d1d --- /dev/null +++ b/files/boilerplate/tunnel.footer @@ -0,0 +1 @@ +#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/files/boilerplate/tunnel.header b/files/boilerplate/tunnel.header new file mode 100644 index 0000000..638fd56 --- /dev/null +++ b/files/boilerplate/tunnel.header @@ -0,0 +1,11 @@ +# +# Shorewall version 4 - Tunnels File +# +# For information about entries in this file, type "man shorewall-tunnels" +# +# The manpage is also online at +# http://www.shorewall.net/manpages/shorewall-tunnels.html +# +############################################################################### +#TYPE ZONE GATEWAY GATEWAY +# ZONE -- cgit v1.2.3 From 8c018a38aadafc94762c6f9bf7efdf9640bbac9b Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 12 Jul 2012 19:32:12 -0400 Subject: update to latest upstream --- files/shorewall.conf.CentOS.6 | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) (limited to 'files') diff --git a/files/shorewall.conf.CentOS.6 b/files/shorewall.conf.CentOS.6 index 0d7a9be..7f9013b 100644 --- a/files/shorewall.conf.CentOS.6 +++ b/files/shorewall.conf.CentOS.6 @@ -42,6 +42,8 @@ LOGLIMIT= MACLIST_LOG_LEVEL=info +RELATED_LOG_LEVEL= + SFILTER_LOG_LEVEL=info SMURF_LOG_LEVEL=info @@ -54,7 +56,9 @@ TCP_FLAGS_LOG_LEVEL=info # L O C A T I O N O F F I L E S A N D D I R E C T O R I E S ############################################################################### -CONFIG_PATH="/etc/shorewall/puppet:/etc/shorewall:/usr/share/shorewall" +CONFIG_PATH="/etc/shorewall/puppet:${CONFDIR}/shorewall:${SHAREDIR}/shorewall" + +GEOIPDIR=/usr/share/xt_geoip/LE IPTABLES= @@ -62,6 +66,8 @@ IP= IPSET= +LOCKFILE= + MODULESDIR= PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin" @@ -139,7 +145,7 @@ FORWARD_CLEAR_MARK= IMPLICIT_CONTINUE=Yes -HIGH_ROUTE_MARKS=No +IPSET_WARNINGS=Yes IP_FORWARDING=On @@ -149,7 +155,7 @@ LEGACY_FASTSTART=Yes LOAD_HELPERS_ONLY=No -MACLIST_TABLE=mangle +MACLIST_TABLE=filter MACLIST_TTL= @@ -191,7 +197,7 @@ TRACK_PROVIDERS=No USE_DEFAULT_RT=No -WIDE_TC_MARKS=No +USE_PHYSICAL_NAMES=No ZONE2ZONE=2 @@ -201,7 +207,9 @@ ZONE2ZONE=2 BLACKLIST_DISPOSITION=DROP -MACLIST_DISPOSITION=DROP +MACLIST_DISPOSITION=REJECT + +RELATED_DISPOSITION=ACCEPT SMURF_DISPOSITION=DROP @@ -209,6 +217,20 @@ SFILTER_DISPOSITION=DROP TCP_FLAGS_DISPOSITION=DROP +################################################################################ +# P A C K E T M A R K L A Y O U T +################################################################################ + +TC_BITS= + +PROVIDER_BITS= + +PROVIDER_OFFSET= + +MASK_BITS= + +ZONE_BITS=0 + ################################################################################ # L E G A C Y O P T I O N # D O N O T D E L E T E O R A L T E R -- cgit v1.2.3 From e4b415405884300af34ed8e5df5e4057cb001099 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 11 Nov 2012 23:21:28 +0100 Subject: Update Wheezy's shorewall.conf to use the new configuration directory. Managed configuration files now live in /etc/shorewall/puppet. --- files/shorewall.conf.Debian.wheezy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'files') diff --git a/files/shorewall.conf.Debian.wheezy b/files/shorewall.conf.Debian.wheezy index b5084c6..09693a6 100644 --- a/files/shorewall.conf.Debian.wheezy +++ b/files/shorewall.conf.Debian.wheezy @@ -72,7 +72,7 @@ SUBSYSLOCK="" MODULESDIR= # add puppet delivered files in front -CONFIG_PATH=/var/lib/puppet/modules/shorewall:/etc/shorewall:/usr/share/shorewall +CONFIG_PATH=/etc/shorewall/puppet:/etc/shorewall:/usr/share/shorewall RESTOREFILE= -- cgit v1.2.3 From ceb57f6a7073b9f7fddfda3ba5b734b168019285 Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 25 Nov 2012 17:49:37 +0100 Subject: add rtrules --- files/boilerplate/rtrules.footer | 1 + files/boilerplate/rtrules.header | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 files/boilerplate/rtrules.footer create mode 100644 files/boilerplate/rtrules.header (limited to 'files') diff --git a/files/boilerplate/rtrules.footer b/files/boilerplate/rtrules.footer new file mode 100644 index 0000000..5e12d1d --- /dev/null +++ b/files/boilerplate/rtrules.footer @@ -0,0 +1 @@ +#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/files/boilerplate/rtrules.header b/files/boilerplate/rtrules.header new file mode 100644 index 0000000..fd9b2f4 --- /dev/null +++ b/files/boilerplate/rtrules.header @@ -0,0 +1,8 @@ +# +# Shorewall version 4 - route rules File +# +# 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 -- cgit v1.2.3 From faf6fba9579e285efd28f2ef96a7e3a5d4a5dd4b Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 25 Nov 2012 18:27:33 +0100 Subject: added provider --- files/boilerplate/providers.footer | 1 + files/boilerplate/providers.header | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 files/boilerplate/providers.footer create mode 100644 files/boilerplate/providers.header (limited to 'files') diff --git a/files/boilerplate/providers.footer b/files/boilerplate/providers.footer new file mode 100644 index 0000000..5e12d1d --- /dev/null +++ b/files/boilerplate/providers.footer @@ -0,0 +1 @@ +#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/files/boilerplate/providers.header b/files/boilerplate/providers.header new file mode 100644 index 0000000..b4a5990 --- /dev/null +++ b/files/boilerplate/providers.header @@ -0,0 +1,9 @@ +# +# Shorewall version 4 - Providers File +# +# For information about entries in this file, type "man shorewall-providers" +# +# For additional information, see http://shorewall.net/MultiISP.html +# +############################################################################################ +#NAME NUMBER MARK DUPLICATE INTERFACE GATEWAY OPTIONS COPY -- cgit v1.2.3