Also irgendwie sind da die Batch-Scripte immernoch inne Wurst... :(

Kann das einer mal vernuenftig testen??

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@431 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/ChangeLog b/doc/ChangeLog
index c954f46cb1ead2a2d5966bffc928a56daab704cd..52900fd46e0c4827cde426012edef14357ce8fd1 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,104 @@
+------------------------------------------------------------------------
+r430 | ms | 2007-02-22 22:18:59 +0100 (Thu, 22 Feb 2007) | 2 lines
+
+Fehlende CGIs in ISO gebaut
+
+------------------------------------------------------------------------
+r429 | ms | 2007-02-22 22:15:08 +0100 (Thu, 22 Feb 2007) | 2 lines
+
+Defektes Menue gefixt
+
+------------------------------------------------------------------------
+r428 | ms | 2007-02-22 21:15:06 +0100 (Thu, 22 Feb 2007) | 2 lines
+
+packages list aktualisiert...
+
+------------------------------------------------------------------------
+r427 | ms | 2007-02-22 20:36:09 +0100 (Thu, 22 Feb 2007) | 2 lines
+
+Batch-Script wiederhergestellt fuer Detlefs Nightly Builds...
+
+------------------------------------------------------------------------
+r426 | ms | 2007-02-22 19:42:58 +0100 (Thu, 22 Feb 2007) | 4 lines
+
+Hab mal alles ein wenig bereinigt, da wir die alten Sachen nichtmehr brauchen...
+connections.cgi hab ich gefixt - Die geht jetzt wieder praechtig!
+Und irgendwer (wohl mal wieder ich) hat in der lfs/iptables rumgewuetet :D Sowas aber auch... Tztz
+
+------------------------------------------------------------------------
+r425 | ms | 2007-02-21 19:56:00 +0100 (Wed, 21 Feb 2007) | 2 lines
+
+Ein NTFS-Update fuer den Heiner :D
+
+------------------------------------------------------------------------
+r424 | ms | 2007-02-20 21:45:54 +0100 (Tue, 20 Feb 2007) | 2 lines
+
+MiniRev: Andere Sprachen entfernt die wir eh nicht brauchen
+
+------------------------------------------------------------------------
+r423 | ms | 2007-02-17 23:00:37 +0100 (Sat, 17 Feb 2007) | 3 lines
+
+Maniacikarus Samba.cgi eingespielt
+mISDN eingebaut
+
+------------------------------------------------------------------------
+r422 | ms | 2007-02-16 13:55:09 +0100 (Fri, 16 Feb 2007) | 2 lines
+
+Clamav Update auf 0.90
+
+------------------------------------------------------------------------
+r421 | ms | 2007-02-15 22:26:14 +0100 (Thu, 15 Feb 2007) | 2 lines
+
+Updatexlrator (not tested yet)
+
+------------------------------------------------------------------------
+r420 | ms | 2007-02-15 19:17:05 +0100 (Thu, 15 Feb 2007) | 2 lines
+
+ExtraHD! Die Erweiterung um Festplatten schnell einzubinden!
+
+------------------------------------------------------------------------
+r419 | ms | 2007-02-15 10:22:09 +0100 (Thu, 15 Feb 2007) | 3 lines
+
+NTFS-Treiber eingebaut fuer das Festplattenfeature von Silvio
+Morning Reconnect auf 5 Uhr verschoben...
+
+------------------------------------------------------------------------
+r418 | ms | 2007-02-14 20:30:59 +0100 (Wed, 14 Feb 2007) | 4 lines
+
+Credits ueberarbeitet.
+Menue Rewrite
+Connectioncheck gefixt --> DSL/PPPoE works!
+
+------------------------------------------------------------------------
+r417 | ms | 2007-02-13 20:49:12 +0100 (Tue, 13 Feb 2007) | 2 lines
+
+QoS-HTML Fixes
+
+------------------------------------------------------------------------
+r416 | ms | 2007-02-13 20:31:38 +0100 (Tue, 13 Feb 2007) | 2 lines
+
+Bash promt im Fedora Core Style gemacht
+
+------------------------------------------------------------------------
+r415 | ms | 2007-02-13 20:29:03 +0100 (Tue, 13 Feb 2007) | 2 lines
+
+Sources-ISO Fix
+
+------------------------------------------------------------------------
+r414 | ms | 2007-02-13 19:18:11 +0100 (Tue, 13 Feb 2007) | 2 lines
+
+Unseren GPG Schluessel hinzugefuegt
+
+------------------------------------------------------------------------
+r413 | ms | 2007-02-13 17:54:19 +0100 (Tue, 13 Feb 2007) | 2 lines
+
+MoBlock hinzugefuegt (fuer Outgoing Firewall)
+
+------------------------------------------------------------------------
+r412 | ms | 2007-02-12 19:38:45 +0100 (Mon, 12 Feb 2007) | 2 lines
+
+Changelog-Fix
+
 ------------------------------------------------------------------------
 r411 | ms | 2007-02-12 19:37:00 +0100 (Mon, 12 Feb 2007) | 3 lines
 

diff --git a/tools/make-functions b/tools/make-functions
index 8ce5bc2c61acca2f7f9e04e926247ff6842c8d20..8a0f50ffd1519e85f2c8f08fe4582da98e049faa 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -476,16 +476,16 @@ batch_script() {
        $0 build
        evaluate 1 mail_me ERROR
 
-       echo "### UPLOADING ISO"
-       $0 upload iso
-       evaluate 1 mail_me ISO
+#      echo "### UPLOADING ISO"
+#      $0 upload iso
+#      evaluate 1 mail_me ISO
        
-       echo -ne "### UPLOADING PAKS"
-       $0 upload paks
-       evaluate 1 mail_me PAKS
+#      echo -ne "### UPLOADING PAKS"
+#      $0 upload paks
+#      evaluate 1 mail_me PAKS
 
        echo -ne "${BOLD}***SUCCESS!${NORMAL}"
-       evaluate 0 mail_me SUCCESS
+       mail_me success
        exit 0
 }
 
@@ -503,7 +503,7 @@ mail_me() {
                        SUBJECT="SUCCESS: IPFIRE-BUILD R$SVN_REVISION on `hostname`"
                        cat <<END > /tmp/ipfire_mail_body
 Building IPFire on `hostname` in Revision $SVN_REVISION was successfull!
-You can find the ISO on your ftp server.
+You can find the ISO on your ftp server if you told the script where it is.
 
 Statistics:
 -----------

diff --git a/tools/perfTest.sh b/tools/perfTest.sh
index 063a2cbefe128cacbdb37baa9e0f18a6a2bcb483..12e5f99fba81e49b4d6d84b35ad3aada102dad95 100644 (file)
--- a/tools/perfTest.sh
+++ b/tools/perfTest.sh
@@ -38,7 +38,7 @@ CGI_HOST=$1
 CGI_PORT=444
 CGI_URL="https://$CGI_HOST:$CGI_PORT/cgi-bin"
 USER=admin
-PASS=test
+PASS=ipfire
 CMD="wget -q -O /dev/null --http-user=$USER --http-passwd=$PASS"
 
 doTest() {