Update product name in config files

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9031 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-12-13 19:30:23 +00:00
parent 82c92cce16
commit d33b803eb4
15 changed files with 55 additions and 56 deletions

View File

@ -1,6 +1,6 @@
# Shorewall Makefile to restart if config-files are newer than last restart # Shorewall6 Makefile to restart if config-files are newer than last restart
VARDIR=$(shell /sbin/shorewall show vardir) VARDIR=$(shell /sbin/shorewall6 show vardir)
CONFDIR=/etc/shorewall CONFDIR=/etc/shorewall6
RESTOREFILE?=.restore RESTOREFILE?=.restore
all: $(VARDIR)/${RESTOREFILE} all: $(VARDIR)/${RESTOREFILE}

View File

@ -1,4 +1,4 @@
# Shorewall Packet Filtering Firewall Export Directory Makefile - V4.2 # Shorewall6 Packet Filtering Firewall Export Directory Makefile - V4.2
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #
@ -40,7 +40,7 @@ HOST = gateway
# #
# Save some typing # Save some typing
# #
LITEDIR = /var/lib/shorewall-lite LITEDIR = /var/lib/shorewall6-lite
# #
# Set this if the remote system has a non-standard modules directory # Set this if the remote system has a non-standard modules directory
# #
@ -56,25 +56,25 @@ all: firewall
# Only generate the capabilities file if it doesn't already exist # Only generate the capabilities file if it doesn't already exist
# #
capabilities: capabilities:
ssh root@$(HOST) "MODULESDIR=$(MODULESDIR) /usr/share/shorewall-lite/shorecap > $(LITEDIR)/capabilities" ssh root@$(HOST) "MODULESDIR=$(MODULESDIR) /usr/share/shorewall6-lite/shorecap > $(LITEDIR)/capabilities"
scp root@$(HOST):$(LITEDIR)/capabilities . scp root@$(HOST):$(LITEDIR)/capabilities .
# #
# Compile the firewall script. Using the 'wildcard' function causes "*" to be expanded so that # Compile the firewall script. Using the 'wildcard' function causes "*" to be expanded so that
# 'filter-out' will be presented with the list of files in this directory rather than "*" # 'filter-out' will be presented with the list of files in this directory rather than "*"
# #
firewall: $(filter-out $(IGNOREFILES) capabilities , $(wildcard *) ) capabilities firewall: $(filter-out $(IGNOREFILES) capabilities , $(wildcard *) ) capabilities
shorewall compile -e . firewall shorewall6 compile -e . firewall
# #
# Only reload on demand. # Only reload on demand.
# #
install: firewall install: firewall
scp firewall firewall.conf root@$(HOST):$(LITEDIR) scp firewall firewall.conf root@$(HOST):$(LITEDIR)
ssh root@$(HOST) "/sbin/shorewall-lite restart" ssh root@$(HOST) "/sbin/shorewall6-lite restart"
# #
# Save running configuration # Save running configuration
# #
save: save:
ssh root@$(HOST) "/sbin/shorewall-lite save" ssh root@$(HOST) "/sbin/shorewall6-lite save"
# #
# Remove generated files # Remove generated files
# #

View File

@ -1,7 +1,7 @@
# #
# Shorewall version 4 - Modules File # Shorewall6 version 4 - Modules File
# #
# /usr/share/shorewall/modules # /usr/share/shorewall6/modules
# #
# This file loads the modules that may be needed by the firewall. # This file loads the modules that may be needed by the firewall.
# #
@ -19,11 +19,12 @@
loadmodule nfnetlink loadmodule nfnetlink
loadmodule x_tables loadmodule x_tables
loadmodule ip_tables loadmodule ip_tables
loadmodule iptable_filter ip6table_filter
loadmodule iptable_mangle ip6table_mangle
ip6table_raw
loadmodule ip_conntrack loadmodule ip_conntrack
loadmodule nf_conntrack loadmodule nf_conntrack
loadmodule nf_conntrack_ipv4 loadmodule nf_conntrack_ipv6
loadmodule iptable_nat loadmodule iptable_nat
loadmodule xt_state loadmodule xt_state
loadmodule xt_tcpudp loadmodule xt_tcpudp

View File

@ -1,27 +1,26 @@
# #
# Shorewall version 4 - Params File # Shorewall6 version 4 - Params File
# #
# /etc/shorewall/params # /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 # It is suggested that variable names begin with an upper case letter
# to distinguish them from variables used internally within the # to distinguish them from variables used internally within the
# Shorewall programs # Shorewall6 programs
# #
# Example: # Example:
# #
# NET_IF=eth0 # NET_IF=eth0
# NET_BCAST=130.252.100.255 # NET_OPTIONS=dhcp,nosmurfs
# NET_OPTIONS=routefilter,norfc1918
# #
# Example (/etc/shorewall/interfaces record): # Example (/etc/shorewall6/interfaces record):
# #
# net $NET_IF $NET_BCAST $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 130.252.100.255 routefilter,norfc1918 # net eth0 - dhcp,nosmurfs
# #
############################################################################### ###############################################################################
#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE #LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE

View File

@ -1,10 +1,10 @@
# #
# Shorewall version 4 - Policy File # Shorewall6 version 4 - Policy File
# #
# For information about entries in this file, type "man shorewall-policy" # For information about entries in this file, type "man shorewall6-policy"
# #
# The manpage is also online at # The manpage is also online at
# http://www.shorewall.net/manpages/shorewall-policy.html # http://www.shorewall.net/manpages6/shorewall6-policy.html
# #
############################################################################### ###############################################################################
#SOURCE DEST POLICY LOG LIMIT: CONNLIMIT: #SOURCE DEST POLICY LOG LIMIT: CONNLIMIT:

View File

@ -1,7 +1,7 @@
# #
# Shorewall version 4 - Providers File # Shorewall6 version 4 - Providers File
# #
# For information about entries in this file, type "man shorewall-providers" # For information about entries in this file, type "man shorewall6-providers"
# #
# For additional information, see http://shorewall.net/MultiISP.html # For additional information, see http://shorewall.net/MultiISP.html
# #

View File

@ -1,10 +1,10 @@
# #
# Shorewall version 4 - Routestopped File # Shorewall6 version 4 - Routestopped File
# #
# For information about entries in this file, type "man shorewall-routestopped" # For information about entries in this file, type "man shorewall6-routestopped"
# #
# The manpage is also online at # The manpage is also online at
# http://www.shorewall.net/manpages/shorewall-routestopped.html # http://www.shorewall.net/manpages/shorewall6-routestopped.html
# #
# See http://shorewall.net/starting_and_stopping_shorewall.htm for additional # See http://shorewall.net/starting_and_stopping_shorewall.htm for additional
# information. # information.

View File

@ -1,10 +1,10 @@
# #
# Shorewall version 4 - Rules File # Shorewall6 version 4 - Rules File
# #
# For information on the settings in this file, type "man shorewall-rules" # For information on the settings in this file, type "man shorewall6-rules"
# #
# The manpage is also online at # The manpage is also online at
# http://www.shorewall.net/manpages/shorewall-rules.html # http://www.shorewall.net/manpages6/shorewall6-rules.html
# #
#################################################################################################################################################### ####################################################################################################################################################
#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ MARK CONNLIMIT TIME #ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ MARK CONNLIMIT TIME

View File

@ -1,9 +1,9 @@
# #
# Shorewall version 4 - Start File # Shorewall6 version 4 - Start File
# #
# /etc/shorewall/start # /etc/shorewall6/start
# #
# Add commands below that you want to be executed after shorewall has # Add commands below that you want to be executed after shorewall6 has
# been started or restarted. # been started or restarted.
# #
# See http://shorewall.net/shorewall_extension_scripts.htm for additional # See http://shorewall.net/shorewall_extension_scripts.htm for additional

View File

@ -1,17 +1,16 @@
# #
# Shorewall version 4 - Started File # Shorewall6 version 4 - Started File
# #
# /etc/shorewall/started # /etc/shorewall6/started
# #
# Add commands below that you want to be executed after shorewall has # Add commands below that you want to be executed after shorewall6 has
# been completely started or restarted. The difference between this # been completely started or restarted. The difference between this
# extension script and /etc/shorewall/start is that this one is invoked # extension script and /etc/shorewall6/start is that this one is invoked
# after delayed loading of the blacklist (DELAYBLACKLISTLOAD=Yes) and
# after the 'shorewall' chain has been created (thus signaling that the # after the 'shorewall' chain has been created (thus signaling that the
# firewall is completely up). # firewall is completely up).
# #
# This script should not change the firewall configuration directly but # This script should not change the firewall configuration directly but
# may do so indirectly by running /sbin/shorewall with the 'nolock' # may do so indirectly by running /sbin/shorewall6 with the 'nolock'
# option. # option.
# #
# See http://shorewall.net/shorewall_extension_scripts.htm for additional # See http://shorewall.net/shorewall_extension_scripts.htm for additional

View File

@ -1,10 +1,10 @@
# #
# Shorewall version 4 - Stop File # Shorewall6 version 4 - Stop File
# #
# /etc/shorewall/stop # /etc/shorewall6/stop
# #
# Add commands below that you want to be executed at the beginning of a # Add commands below that you want to be executed at the beginning of a
# "shorewall stop" command. # "shorewall6 stop" command.
# #
# See http://shorewall.net/shorewall_extension_scripts.htm for additional # See http://shorewall.net/shorewall_extension_scripts.htm for additional
# information. # information.

View File

@ -1,10 +1,10 @@
# #
# Shorewall version 4 - Stopped File # Shorewall6 version 4 - Stopped File
# #
# /etc/shorewall/stopped # /etc/shorewall6/stopped
# #
# Add commands below that you want to be executed at the completion of a # Add commands below that you want to be executed at the completion of a
# "shorewall stop" command. # "shorewal6l stop" command.
# #
# See http://shorewall.net/shorewall_extension_scripts.htm for additional # See http://shorewall.net/shorewall_extension_scripts.htm for additional
# information. # information.

View File

@ -1,7 +1,7 @@
# #
# Shorewall version 4 - Tcdevices File # Shorewall6 version 4 - Tcdevices File
# #
# For information about entries in this file, type "man shorewall-tcdevices" # For information about entries in this file, type "man shorewall6-tcdevices"
# #
# See http://shorewall.net/traffic_shaping.htm for additional information. # See http://shorewall.net/traffic_shaping.htm for additional information.
# #

View File

@ -1,10 +1,10 @@
# #
# Shorewall version 4 - Tunnels File # Shorewall6 version 4 - Tunnels File
# #
# For information about entries in this file, type "man shorewall-tunnels" # For information about entries in this file, type "man shorewall6-tunnels"
# #
# The manpage is also online at # The manpage is also online at
# http://www.shorewall.net/manpages/shorewall-tunnels.html # http://www.shorewall.net/manpages6/shorewall6-tunnels.html
# #
############################################################################### ###############################################################################
#TYPE ZONE GATEWAY GATEWAY #TYPE ZONE GATEWAY GATEWAY

View File

@ -1,10 +1,10 @@
# #
# Shorewall version 4 - Zones File # Shorewall6 version 4 - Zones File
# #
# For information about this file, type "man shorewall-zones" # For information about this file, type "man shorewall6-zones"
# #
# The manpage is also online at # The manpage is also online at
# http://www.shorewall.net/manpages/shorewall-zones.html # http://www.shorewall.net/manpages6/shorewall6-zones.html
# #
############################################################################### ###############################################################################
#ZONE TYPE OPTIONS IN OUT #ZONE TYPE OPTIONS IN OUT