From f615f4f82b29b608c717a274f938b4bd2df9576e Mon Sep 17 00:00:00 2001 From: teastep Date: Fri, 26 Dec 2008 15:45:51 +0000 Subject: [PATCH] More manpage updates git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9170 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- docs/6to4.xml | 21 +++++++----- manpages-lite/shorewall-lite.conf.xml | 9 ++++-- manpages6-lite/shorewall6-lite.conf.xml | 9 ++++-- tools/build/buildshorewall | 10 ++++++ tools/build/upload | 43 +++++-------------------- 5 files changed, 43 insertions(+), 49 deletions(-) diff --git a/docs/6to4.xml b/docs/6to4.xml index d78c850a5..10699f3ec 100644 --- a/docs/6to4.xml +++ b/docs/6to4.xml @@ -78,7 +78,7 @@ SIT="sit1" INTERFACES="eth1" -ADDRESS=206.124.146.180 +ADDRESS4=206.124.146.180 SLA=1 @@ -92,13 +92,13 @@ SLA=1 - ADDRESS - A static IPv4 address on your firewall that you want - to use for the tunnel. + ADDRESS4 - A static IPv4 address on your firewall that you + want to use for the tunnel. - The identity of the first local sub-network that you want to - assign to the interfaces listed in INTERFACES. Normally one + SLA - The identity of the first local sub-network that you + want to assign to the interfaces listed in INTERFACES. Normally one (0001). @@ -107,7 +107,7 @@ SLA=1 SIT="sit1" INTERFACES="eth0 eth2" -ADDRESS=206.124.146.180 +ADDRESS4=206.124.146.180 SLA=1 eth0 is the interface to my local network (both wired and @@ -159,8 +159,8 @@ gateway:~ # ADDRESS (206.124.146.180). So once you start the 6to4 tunnel, you are the proud owner of 280 IPv6 addresses! In the case shown here, 2002:ce7c:92b4::/48. The SLA is used to assign each - interface in INTERFACES, 264 addresses; in - the case of eth0, 2002:ce7c:92b4:1::/64. + interface in INTERFACES, a subnet of 264 + addresses; in the case of eth0, 2002:ce7c:92b4:1::/64. I run radvd on the firewall to allow hosts conntected to eth0 and eth2 to automatically @@ -290,6 +290,11 @@ ursa:~ # The Shorewall6 configuration on my firewall is a very basic three-interface one. + Key entry in + /etc/shorewall6/shorewall6.conf: + + IP_FORWARDING=On + /etc/shorewall6/zones: #ZONE TYPE OPTIONS IN OUT diff --git a/manpages-lite/shorewall-lite.conf.xml b/manpages-lite/shorewall-lite.conf.xml index 712fa9108..a540630bc 100644 --- a/manpages-lite/shorewall-lite.conf.xml +++ b/manpages-lite/shorewall-lite.conf.xml @@ -1,4 +1,6 @@ + shorewall-lite.conf @@ -92,8 +94,9 @@ - PATH=[pathname[:pathname]...] + PATH=pathname[:pathname]... Determines the order in which Shorewall searches directories @@ -189,4 +192,4 @@ shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5) - \ No newline at end of file + diff --git a/manpages6-lite/shorewall6-lite.conf.xml b/manpages6-lite/shorewall6-lite.conf.xml index ef7e7fc83..f7c693117 100644 --- a/manpages6-lite/shorewall6-lite.conf.xml +++ b/manpages6-lite/shorewall6-lite.conf.xml @@ -94,8 +94,10 @@ - PATH=[pathname[:pathname]...] + PATH=pathname[:pathname]... Determines the order in which Shorewall6 searches directories @@ -144,7 +146,8 @@ - VERBOSITY=[number] + VERBOSITY=[number] Shorewall6 has traditionally been very noisy (produced lots of diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall index 6db9192c4..1fa2bb025 100755 --- a/tools/build/buildshorewall +++ b/tools/build/buildshorewall @@ -358,25 +358,35 @@ case $VERSION in PATCHNUM=${VERSION##*.} BASEVERSION=${VERSION%.*} SVNBRANCH="tags/${BASEVERSION}/Shorewall-common-${PATCHNUM}" + SVN6BRANCH="tags/${BASEVERSION}/Shorewall6-${PATCHNUM}" LITESVNBRANCH="/tags/${BASEVERSION}/Shorewall-lite-${PATCHNUM}" + LITE6SVNBRANCH="/tags/${BASEVERSION}/Shorewall6-lite-${PATCHNUM}" PERLBRANCH="tags/${BASEVERSION}/Shorewall-perl-${PATCHNUM}" SHELLBRANCH="tags/${BASEVERSION}/Shorewall-shell-${PATCHNUM}" DOCTAG="trunk/docs" XMLPROJ="docs-4.2" SAMPLESTAG="tags/${BASEVERSION}/Samples" + SAMPLES6TAG="trunk/Samples6" MANPAGETAG="tags/${BASEVERSION}/manpages" + MANPAGE6TAG="tags/${BASEVERSION}/manpages6" LITEMANPAGETAG="tags/${BASEVERSION}/manpages-lite" + LITE6MANPAGETAG="tags/${BASEVERSION}/manpages6-lite" ;; 4.2.*) SVNBRANCH="branches/4.2/Shorewall-common" + SVN6BRANCH="branches/4.2//Shorewall6" LITESVNBRANCH="branches/4.2/Shorewall-lite" + LITE6SVNBRANCH="branches/4.2/Shorewall6-lite" PERLBRANCH="branches/4.2/Shorewall-perl" SHELLBRANCH="branches/4.2/Shorewall-shell" DOCTAG="trunk/docs" XMLPROJ="docs-4.2" SAMPLESTAG="trunk/Samples" + SAMPLES6TAG="trunk/Samples6" MANPAGETAG=trunk/manpages + MANPAGE6TAG=trunk/manpages6 LITEMANPAGETAG=trunk/manpages-lite + LITE6MANPAGETAG=trunk/manpages6-lite ;; 4.0.*.*) PATCHRELEASE=Yes diff --git a/tools/build/upload b/tools/build/upload index 55c016a7f..450d4574e 100755 --- a/tools/build/upload +++ b/tools/build/upload @@ -142,7 +142,9 @@ case $1 in DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1" SHOREWALL=shorewall-common rpm=shorewall-common-${1%-*}-0${1#*-}.noarch.rpm + rpm6=shorewall6-${1%-*}-0${1#*-}.noarch.rpm literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm + lite6rpm=shorewall6-lite-${1%-*}-0${1#*-}.noarch.rpm perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm BASE=Yes @@ -153,7 +155,9 @@ case $1 in DEST="/srv/ftp/pub/shorewall/${BASEVERSION%.*}/shorewall-${BASEVERSION}" SHOREWALL=shorewall-common rpm=shorewall-common-${BASEVERSION}-${PATCHNUM}.noarch.rpm + rpm6=shorewall6-${BASEVERSION}-${PATCHNUM}.noarch.rpm literpm=shorewall-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm + lite6rpm=shorewall6-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm perlrpm=shorewall-perl-${BASEVERSION}-${PATCHNUM}.noarch.rpm shellrpm=shorewall-shell-${BASEVERSION}-${PATCHNUM}.noarch.rpm ;; @@ -161,7 +165,9 @@ case $1 in DEST="/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1" SHOREWALL=shorewall-common rpm=shorewall-common-${1}-0base.noarch.rpm + rpm6=shorewall6-${1}-0base.noarch.rpm literpm=shorewall-lite-${1}-0base.noarch.rpm + lite6rpm=shorewall6-lite-${1}-0base.noarch.rpm perlrpm=shorewall-perl-${1}-0base.noarch.rpm shellrpm=shorewall-shell-${1}-0base.noarch.rpm BASE=Yes @@ -177,42 +183,9 @@ case $1 in lite6rpm=shorewall6-lite-${1}-0base.noarch.rpm BASE=Yes ;; - 3.*[13579].*) - DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1" - rpm=shorewall-${1}-1.noarch.rpm - literpm=shorewall-lite-${1}-1.noarch.rpm - ;; - *.*[13579].*) - DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1" - rpm=shorewall-${1}-1.noarch.rpm - ;; - 3.*Beta*|*RC*) - DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1" - rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm - literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm - ;; - *.*Beta*|*RC*) - DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1" - rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm - literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm - perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm - shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm - ;; - 3.[2468].*) - DEST="/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1" - rpm=shorewall-${1}-1.noarch.rpm - literpm=shorewall-lite-${1}-1.noarch.rpm - ;; - *.[2468].*) - DEST="/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1" - rpm=shorewall-${1}-1.noarch.rpm - literpm=shorewall-lite-${1}-1.noarch.rpm - perlrpm=shorewall-perl-${1}-1.noarch.rpm - shellrpm=shorewall-shell-${1}-1.noarch.rpm - ;; *) - DEST="/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1" - rpm=shorewall-${1}-1.noarch.rpm + echo "Unknown Version $1" >&2 + exit 1 ;; esac