Changeset 874 in MondoRescue

Timestamp:

Oct 5, 2006, 12:30:57 AM (18 years ago)

Author:

Bruno Cornec

Message:

Centralize the delivery machine detection
Announce of mp3

Location:

branches/stable

Files:

• tools/ftp-env (modified) (1 diff)
• tools/livwww (modified) (2 diffs)
• website/announces3.sql (modified) ( previous)

branches/stable/tools/ftp-env

@@ -7 +7 @@
 
 # BerliOS FTP/SSH setup
-export ACCOUNT=bruno@ftp.mondorescue.org
+/sbin/ifconfig | egrep -q '10\.3' 2>&1 > /dev/null
+if [ $? = 0 ]; then
+    export DESTMACH=mondo.hpintelco.org
+else
+    export DESTMACH=www.mondorescue.org
+fi
+
+export ACCOUNT=bruno@$DESTMACH
 export DSTDIR=/mondo/ftp
 export FTPSERV="ftp.berlios.de"

branches/stable/tools/livwww

@@ -31 +31 @@
 fi
 
-/sbin/ifconfig | egrep -q '10\.3' 2>&1 > /dev/null
-if [ $? = 0 ]; then
-    DESTMACH=mondo.hpintelco.org
-else
-    DESTMACH=www.mondorescue.org
-fi
-
 dname=`dirname $0`
 prem=`echo $dname |cut -c1`
@@ -48 +41 @@
 . $TOOLHOME/common-env
 . $TOOLHOME/svn-env
+. $TOOLHOME/ftp-env
 
 # To be safe for SVN commands