holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Allow the update and stage scripts to run on the primary server

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6858 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-07-14 14:52:31 +00:00
parent 9875dc1e84
commit b716223fb5
2 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tools/build/stage
View File

@ -5,65 +5,70 @@ literpm=
perldir= perldir=
shelldir= shelldir=
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/staging//shorewall-$1" DEST=
USER="webmin@mail.shorewall.net:"
SHOREWALL=shorewall
COMMAND=scp
case $1 in case $1 in
4.*Beta*|4.*RC*) 4.*Beta*|4.*RC*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
SHOREWALL=shorewall-common
rpm=shorewall-common-${1%-*}-0${1#*-}.noarch.rpm rpm=shorewall-common-${1%-*}-0${1#*-}.noarch.rpm
literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm
shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm
;; ;;
4.0.*) 4.0.*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
SHOREWALL=shorewall-common
rpm=shorewall-common-${1}-1.noarch.rpm rpm=shorewall-common-${1}-1.noarch.rpm
literpm=shorewall-lite-${1}-1.noarch.rpm literpm=shorewall-lite-${1}-1.noarch.rpm
perlrpm=shorewall-perl-${1}-1.noarch.rpm perlrpm=shorewall-perl-${1}-1.noarch.rpm
shellrpm=shorewall-shell-${1}-1.noarch.rpm shellrpm=shorewall-shell-${1}-1.noarch.rpm
;; ;;
3.9.*) 3.9.*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
rpm=shorewall-${1}-1.noarch.rpm rpm=shorewall-${1}-1.noarch.rpm
literpm=shorewall-lite-${1}-1.noarch.rpm literpm=shorewall-lite-${1}-1.noarch.rpm
perlrpm=shorewall-perl-${1}-1.noarch.rpm perlrpm=shorewall-perl-${1}-1.noarch.rpm
shellrpm=shorewall-shell-${1}-1.noarch.rpm shellrpm=shorewall-shell-${1}-1.noarch.rpm
;; ;;
3.*[13579].*) 3.*[13579].*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
rpm=shorewall-${1}-1.noarch.rpm rpm=shorewall-${1}-1.noarch.rpm
literpm=shorewall-lite-${1}-1.noarch.rpm literpm=shorewall-lite-${1}-1.noarch.rpm
;; ;;
*.*[13579].*) *.*[13579].*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
rpm=shorewall-${1}-1.noarch.rpm rpm=shorewall-${1}-1.noarch.rpm
;; ;;
3.*Beta*|*RC*) 3.*Beta*|*RC*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm
literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
;; ;;
*.*Beta*|*RC*) *.*Beta*|*RC*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm
literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm
shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm
;; ;;
3.[2468].*) 3.[2468].*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
rpm=shorewall-${1}-1.noarch.rpm rpm=shorewall-${1}-1.noarch.rpm
literpm=shorewall-lite-${1}-1.noarch.rpm literpm=shorewall-lite-${1}-1.noarch.rpm
;; ;;
*.[2468].*) *.[2468].*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/${1%.*}/development/staging//${1%.*}shorewall-$1" DEST="/srv/ftp/pub/shorewall/${1%.*}/development/staging//${1%.*}shorewall-$1"
rpm=shorewall-${1}-1.noarch.rpm rpm=shorewall-${1}-1.noarch.rpm
literpm=shorewall-lite-${1}-1.noarch.rpm literpm=shorewall-lite-${1}-1.noarch.rpm
perlrpm=shorewall-perl-${1}-1.noarch.rpm perlrpm=shorewall-perl-${1}-1.noarch.rpm
shellrpm=shorewall-shell-${1}-1.noarch.rpm shellrpm=shorewall-shell-${1}-1.noarch.rpm
;; ;;
*) *)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
rpm=shorewall-${1}-1.noarch.rpm rpm=shorewall-${1}-1.noarch.rpm
;; ;;
esac esac
@ -80,6 +85,12 @@ else
cat shorewall-common-${1}/releasenotes.txt > releasenotes.txt cat shorewall-common-${1}/releasenotes.txt > releasenotes.txt
fi fi
ssh ${DEST%%:*} mkdir -p ${DEST#*:} if [ "$HOSTNAME" = lists ]; then
mkdir -p $DEST
COMMAND=cp
else
ssh $USER mkdir -p $DEST
$DEST=${USER}${DEST}
fi
scp -r errata known_problems.txt patch-$1 ${1}.* releasenotes.txt shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $literpm $perlrpm $shellrpm $DEST $COMMAND -r errata known_problems.txt patch-$1 ${1}.* releasenotes.txt shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $literpm $perlrpm $shellrpm $DEST

38
tools/build/upload
View File

@ -5,63 +5,70 @@ literpm=
perlrpm= perlrpm=
shellrpm= shellrpm=
DEST=
USER="webmin@mail.shorewall.net:"
SHOREWALL=shorewall
COMMAND=scp
case $1 in case $1 in
4.*Beta*|4.*RC*) 4.*Beta*|4.*RC*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
SHOREWALL=shorewall-common
rpm=shorewall-common-${1%-*}-0${1#*-}.noarch.rpm rpm=shorewall-common-${1%-*}-0${1#*-}.noarch.rpm
literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm
shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm
;; ;;
4.0.*) 4.0.*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
SHOREWALL=shorewall-common
rpm=shorewall-common-${1}-1.noarch.rpm rpm=shorewall-common-${1}-1.noarch.rpm
literpm=shorewall-lite-${1}-1.noarch.rpm literpm=shorewall-lite-${1}-1.noarch.rpm
perlrpm=shorewall-perl-${1}-1.noarch.rpm perlrpm=shorewall-perl-${1}-1.noarch.rpm
shellrpm=shorewall-shell-${1}-1.noarch.rpm shellrpm=shorewall-shell-${1}-1.noarch.rpm
;; ;;
3.9.*) 3.9.*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
rpm=shorewall-${1}-1.noarch.rpm rpm=shorewall-${1}-1.noarch.rpm
literpm=shorewall-lite-${1}-1.noarch.rpm literpm=shorewall-lite-${1}-1.noarch.rpm
perlrpm=shorewall-perl-${1}-1.noarch.rpm perlrpm=shorewall-perl-${1}-1.noarch.rpm
shellrpm=shorewall-shell-${1}-1.noarch.rpm shellrpm=shorewall-shell-${1}-1.noarch.rpm
;; ;;
3.*[13579].*) 3.*[13579].*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
rpm=shorewall-${1}-1.noarch.rpm rpm=shorewall-${1}-1.noarch.rpm
literpm=shorewall-lite-${1}-1.noarch.rpm literpm=shorewall-lite-${1}-1.noarch.rpm
;; ;;
*.*[13579].*) *.*[13579].*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
rpm=shorewall-${1}-1.noarch.rpm rpm=shorewall-${1}-1.noarch.rpm
;; ;;
3.*Beta*|*RC*) 3.*Beta*|*RC*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm
literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
;; ;;
*.*Beta*|*RC*) *.*Beta*|*RC*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm
literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm
shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm
;; ;;
3.[2468].*) 3.[2468].*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1"
rpm=shorewall-${1}-1.noarch.rpm rpm=shorewall-${1}-1.noarch.rpm
literpm=shorewall-lite-${1}-1.noarch.rpm literpm=shorewall-lite-${1}-1.noarch.rpm
;; ;;
*.[2468].*) *.[2468].*)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1"
rpm=shorewall-${1}-1.noarch.rpm rpm=shorewall-${1}-1.noarch.rpm
literpm=shorewall-lite-${1}-1.noarch.rpm literpm=shorewall-lite-${1}-1.noarch.rpm
perlrpm=shorewall-perl-${1}-1.noarch.rpm perlrpm=shorewall-perl-${1}-1.noarch.rpm
shellrpm=shorewall-shell-${1}-1.noarch.rpm shellrpm=shorewall-shell-${1}-1.noarch.rpm
;; ;;
*) *)
DEST="webadmin@mail.shorewall.net:/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1"
rpm=shorewall-${1}-1.noarch.rpm rpm=shorewall-${1}-1.noarch.rpm
;; ;;
esac esac
@ -72,12 +79,11 @@ esac
echo "There are no known problems in Shorewall version $1" > known_problems.txt echo "There are no known problems in Shorewall version $1" > known_problems.txt
if [ -f shorewall-lite-${1}/releasenotes.txt ]; then if [ "$HOSTNAME" = lists ]; then
cat shorewall-common-${1}/releasenotes.txt shorewall-lite-${1}/releasenotes.txt > releasenotes.txt mkdir -p $DEST
COMMAND=cp
else else
cat shorewall-common-${1}/releasenotes.txt > releasenotes.txt ssh $USER mkdir -p $DEST
fi fi
ssh ${DEST%%:*} mkdir -p ${DEST#*:} $COMMAND -r errata known_problems.txt patch-$1 ${1}.* releasenotes.txt shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $literpm $perlrpm $shellrpm $DEST
scp -r errata known_problems.txt patch-$1 ${1}.* releasenotes.txt shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $literpm $perlrpm $shellrpm $DEST