Brought website to release candidate 2 and the new load balancer...

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

diff --git a/de/art.shtml b/de/art.shtml
index eb9f756568f029a6e9dfab420abd7f9ba54c0550..40ea5450927c111d0a16ee7f407e1fef7328eac1 100644 (file)
--- a/de/art.shtml
+++ b/de/art.shtml
@@ -39,4 +39,6 @@
 
        </div>
 
+</div>
+
 <!--#include virtual="../footer.shtml" -->

diff --git a/de/downloads.shtml b/de/downloads.shtml
index dc5979d6f184080aac20d5e42019ac7a5f72c45f..68bddc599b5fb7f6349ffea12507a71ba59b8bbe 100644 (file)
--- a/de/downloads.shtml
+++ b/de/downloads.shtml
@@ -14,7 +14,7 @@
                                <p>
                                        Hier findet ihr alle Downloads des IPFire-Projektes.<br />
                                        Die gute, stabile Version <a href="#final">1.4.9</a> sowie die <a href="#beta1">Beta 1</a>,
-                                       <a href="#beta2">Beta 2</a> und der aktuelle <a href="#rc1">Release Candidate 1</a>
+                                       <a href="#beta2">Beta 2</a>, <a href="#rc1">RC1</a> und der aktuelle <a href="#rc2">Release Candidate 2</a>
                                        sind hier zu finden.
                                </p>
                                
@@ -24,6 +24,12 @@
                                        Eine Reihe von Torrent-Clients findet ihr in der Liste rechts.
                                </p>
                                
+                               <p>
+                                       Ebenso möchten wir uns an dieser Stelle bei den Personen bedanken, die die zahlreichen Mirrorserver
+                                       für das Projekt zur Verfügung stellen. Das erforderliche Übertragungsvolumen ist in den letzten Wochen
+                                       und Monat drastisch angestiegen und wir hoffen natürlich, dass das so bleibt.
+                               </p>
+                               
                                <br class="clear" />
                        
                                <div class="post">
@@ -39,9 +45,7 @@
 
                                        <div align="right">
                                                <a href="http://download.ipfire.org/torrent/IPFire-1.4.9-FINAL.iso.torrent">IPFire 1.4.9 - TORRENT</a><br />
-                                               <a href="http://mirror1.ipfire.org/iso/IPFire-1.4.9-FINAL.iso">IPFire 1.4.9 - Mirror 1</a><br />
-                                               <a href="http://www.rowie.at/ipfire/IPFire-1.4.9-FINAL.iso">IPFire 1.4.9 - Mirror 2</a><br />
-                                               <a href="http://ipfire.earl-net.com/IPFire-1.4.9-FINAL.iso">IPFire 1.4.9 - Mirror 3</a>
+                                               <a href="http://download.ipfire.org/iso/IPFire-1.4.9-FINAL.iso">IPFire 1.4.9 - HTTP</a>
                                        </div>
                                        
                                        <h4>In der Presse:</h4>
@@ -50,6 +54,26 @@
                                        </p>
                                        
                                </div>
+
+                               <br class="clear" />
+                               
+                               <div class="post">
+                                       <a name="rc2"></a>
+                                       <h3>IPFire 2.0 Release Candidate 2</h3>
+                                       <ul class="post_info">
+                                               <li class="date">3, 2, 1 meins...</li>
+                                       </ul>
+                                       <p>
+                                               Nun steht endlich der zweite Release Candidate zur Verfügung und wir
+                                               bitten um reichliches Testen.
+                                       </p>
+                                       
+                                       <div align="right">
+                                               <a href="http://download.ipfire.org/torrent/ipfire-2.0rc2.i586-full.iso.torrent">IPFire 2.0 RC 2 - TORRENT</a><br />
+                                               <a href="http://download.ipfire.org/iso/ipfire-2.0rc2.i586-full.iso">IPFire 2.0 RC 2 - HTTP</a>
+                                       </div>
+
+                               </div>
                                
                                <br class="clear" />
                                
@@ -69,10 +93,7 @@
                                        
                                        <div align="right">
                                                <a href="http://download.ipfire.org/torrent/ipfire-2.0rc1.i586-full.iso.torrent">IPFire 2.0 RC 1 - TORRENT</a><br />
-                                               <a href="http://download.ipfire.org/iso/ipfire-2.0rc1.i586-full.iso">IPFire 2.0 RC 1 - Mirror 1</a><br />
-                                               <a href="http://mirror2.ipfire.org/iso/ipfire-2.0rc1.i586-full.iso">IPFire 2.0 RC 1 - Mirror 2</a><br />
-                                               <a href="http://www.rowie.at/ipfire/ipfire-2.0rc1.i586-full.iso">IPFire 2.0 RC 1 - Mirror 3</a><br />
-                                               <a href="http://ipfire.earl-net.com/ipfire-2.0rc1.i586-full.iso">IPFire 2.0 RC 1 - Mirror 4</a>
+                                               <a href="http://download.ipfire.org/iso/ipfire-2.0rc1.i586-full.iso">IPFire 2.0 RC 1 - HTTP</a>
                                        </div>
 
                                </div>
@@ -94,10 +115,7 @@
                                        
                                        <div align="right">
                                                <a href="http://download.ipfire.org/torrent/ipfire-2.0beta2.i586-full.iso.torrent">IPFire 2.0 Beta 2 - TORRENT</a><br />
-                                               <a href="http://download.ipfire.org/iso/ipfire-2.0beta2.i586-full.iso">IPFire 2.0 Beta 2 - Mirror 1</a><br />
-                                               <a href="http://mirror2.ipfire.org/iso/ipfire-2.0beta2.i586-full.iso">IPFire 2.0 Beta 2 - Mirror 2</a><br />
-                                               <a href="http://www.rowie.at/ipfire/ipfire-2.0beta2.i586-full.iso">IPFire 2.0 Beta 2 - Mirror 3</a><br />
-                                               <a href="http://ipfire.earl-net.com/ipfire-2.0beta2.i586-full.iso">IPFire 2.0 Beta 2 - Mirror 4</a>
+                                               <a href="http://download.ipfire.org/iso/ipfire-2.0beta2.i586-full.iso">IPFire 2.0 Beta 2 - HTTP</a>
                                        </div>
 
                                </div>
@@ -143,10 +161,7 @@
                                        
                                        <div align="right">
                                                <a href="http://download.ipfire.org/torrent/ipfire-2.0beta1.i586-full.iso.torrent">IPFire 2.0 Beta 1 - TORRENT</a><br />
-                                               <a href="http://download.ipfire.org/iso/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 1</a><br />
-                                               <a href="http://mirror2.ipfire.org/iso/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 2</a><br />
-                                               <a href="http://www.rowie.at/ipfire/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 3</a><br />
-                                               <a href="http://ipfire.earl-net.com/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 4</a>
+                                               <a href="http://download.ipfire.org/iso/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - HTTP</a>
                                        </div>
                                        
                                        <h4>In der Presse:</h4>

diff --git a/de/index.shtml b/de/index.shtml
index d487bee3363183bb43d953e9910059012920adf6..6fea86ab0742200ca292e7aa697a7b1a49cf0346 100644 (file)
--- a/de/index.shtml
+++ b/de/index.shtml
@@ -30,66 +30,18 @@
                                
                                <div class="post">
                                
-                                       <h3>14. Oktober 2007 - Release Candidate 1</h3>
+                                       <h3>28. Oktober 2007 - Release Candidate 2</h3>
                                        <ul class="post_info">
-                                               <li class="date">Check it out</li>
+                                               <li class="date">3, 2, 1, meins...</li>
                                        </ul>                                   
                                        <p>
                                                <b>Sehr geehrte Community!</b><br />
-                                                       Ab sofort steht der Release Candidate 1 im Downloadbereich bereit.<br /><br />
-                                                       <b>Weiters können Sie im Changelog einsehen 
-                                                               <a href="http://wiki.ipfire.org/index.php/RC:1" target="_blank">Changelog</a>!</b>
+                                                       Ab sofort steht der Release Candidate 2 im Downloadbereich bereit.
                                                        <br /><br /><b>Mitch</b> - für das Entwicklerteam von IPFire.org
                                        </p>
                                </div>                          
                                
                                <br class="clear" />
-                               
-                               <div class="post">
-                               
-                                       <h3>24. September 2007 - Beta 2</h3>
-                                       <ul class="post_info">
-                                               <li class="date">1:0 ahead - Halftime</li>
-                                       </ul>                                   
-                                       <p>
-                                               <b>Sehr geehrte Community!</b><br />
-                                                       Ab sofort steht eine weitere BETA Version im Downloadbereich bereit.<br /><br />
-                                                       <b>Weiters können Sie im Changelog einsehen 
-                                                               <a href="http://wiki.ipfire.org/index.php/BETA:2" target="_blank">Changelog</a>!</b>
-                                                       <br /><br /><b>Christian</b> - für das Entwicklerteam von IPFire.org
-                                       </p>
-                               </div>
-                       
-                               <div class="post">
-                               
-                                       <h3>24. August 2007 - Beta 1</h3>
-                                       <ul class="post_info">
-                                               <li class="date">On the way to new goals</li>
-                                       </ul>                                   
-                                       <p>
-                                               <b>Sehr geehrte Community!</b><br />
-                                                       Nach langjähriger Entwicklungszeit sind ich und mein Team froh Ihnen voller Stolz die
-                                                       Version 2.0 unserer Firewall, die sich somit ab dem 24. August 2007 im Beta-Stadium
-                                                       befindet, zu präsentieren.<br/>
-                                                       Basierte die Version 1.4.9, wie die Versionsnummer schon ahnen
-                                                       lässt, noch auf dem IPCop, so handelt es sich nun um eine fast vollständige Neuentwicklung
-                                                       auf Basis des Linux-from-Scratch (LFS) 6.2.<br />
-                                                       Als eine der schwierigsten Aufgaben stellte sich die Integration des Linux-Kernels 2.6, was
-                                                       einige umfassende Änderungen im System nach sich zog. Ähnelt die grafische
-                                                       Weboberfläche noch sehr dem Vorgänger, hat sich aber trotzdem „unter der Haube“ eine
-                                                       kleine Revolution vollzogen. Das Ergebnis ist ein gehärtetes System auf dem allerneuesten
-                                                       Stand mit GCC 4.0.3 und dem stabilen Kernel der Serie 2.6.16.<br />
-                                                       Nachdem dieser maßgebliche Schritt vollzogen war, wurden die bisher zur Ausstattung
-                                                       gehörigen Features wieder integriert. Dazu gehören wichtige Dienste in einem Netzwerk wie
-                                                       ein DHCP- oder NTP-Server, sowie auch DynDNS-Updater um hier nur einige zu nennen.
-                                                       Die vollständige Liste finden Sie in der offiziellen Pressemitteilung.<br /><br />
-                                                       
-                                                       <b>Lesen sie mehr in der offiziellen 
-                                                               <a href="../data/ipfire-press-release-beta-1.pdf" target="_blank">Pressemitteilung</a>!</b>
-                                                       
-                                                       <br /><br /><b>Michael</b> - für das Entwicklerteam von IPFire.org
-                                       </p>
-                               </div>
                
                        </div>
        

diff --git a/en/art.shtml b/en/art.shtml
index 1f1f6529ea229f44891a2c30ce1a69fed244ae52..ae839f77de67a929b4d2dcfc5a94ae8572790d50 100644 (file)
--- a/en/art.shtml
+++ b/en/art.shtml
@@ -38,5 +38,7 @@
                <br class="clear" />
 
        </div>
+       
+</div>
 
 <!--#include virtual="../footer.shtml" -->

diff --git a/en/downloads.shtml b/en/downloads.shtml
index 24ebe43407b93165b0266f9ba300b11f8d838152..5653ab3a39bb28a02dcdc6cb0a8c2110a6b43dae 100644 (file)
--- a/en/downloads.shtml
+++ b/en/downloads.shtml
@@ -24,6 +24,11 @@
                                        A list of torrent clients is on the right bar.
                                </p>
                                
+                               <p>
+                                       We would like to say thanks to all the people that support this project by
+                                       lending their bandwidth. The traffic increased rapidly in the last few month.
+                               </p>
+                               
                                <br class="clear" />
                        
                                <div class="post">
@@ -38,9 +43,7 @@
 
                                        <div align="right">
                                                <a href="http://download.ipfire.org/torrent/IPFire-1.4.9-FINAL.iso.torrent">IPFire 1.4.9 - TORRENT</a><br />
-                                               <a href="http://mirror1.ipfire.org/iso/IPFire-1.4.9-FINAL.iso">IPFire 1.4.9 - Mirror 1</a><br />
-                                               <a href="http://www.rowie.at/ipfire/IPFire-1.4.9-FINAL.iso">IPFire 1.4.9 - Mirror 2</a><br />
-                                               <a href="http://ipfire.earl-net.com/IPFire-1.4.9-FINAL.iso">IPFire 1.4.9 - Mirror 3</a>
+                                               <a href="http://download.ipfire.org/iso/IPFire-1.4.9-FINAL.iso">IPFire 1.4.9 - HTTP</a>
                                        </div>
                                        
                                        <h4>in the press:</h4>
@@ -52,6 +55,26 @@
                                
                                <br class="clear" />
                                
+                               <div class="post">
+                                       <a name="rc2"></a>
+                                       <h3>IPFire 2.0 Release Candidate 2</h3>
+                                       <ul class="post_info">
+                                               <li class="date">3, 2, 1, it's mine...</li>
+                                       </ul>
+                                       <p>
+                                               We are pround to say that we are on the way to the goal. Please check out this
+                                               brand new RC!
+                                       </p>
+                                       
+                                       <div align="right">
+                                               <a href="http://download.ipfire.org/torrent/ipfire-2.0rc2.i586-full.iso.torrent">IPFire 2.0 RC 2 - TORRENT</a><br />
+                                               <a href="http://download.ipfire.org/iso/ipfire-2.0rc2.i586-full.iso">IPFire 2.0 RC 2 - HTTP</a>
+                                       </div>
+
+                               </div>
+                               
+                               <br class="clear" />
+                               
                                <div class="post">
                                        <a name="rc1"></a>
                                        <h3>IPFire 2.0 Release Candidate 1</h3>
@@ -62,15 +85,12 @@
                                                We are pround to say that we are on the way to the goal. Please check out this
                                                brand new RC!<br />
                                                The changelog is <a href="http://wiki.ipfire.org/index.php/RC:1" target="_blank">here</a>
-                                               and a little bit more detailed <a href="http://svn.ipfire.org/log.php?repname=ipfire&path=%2F&rev=0&sc=1&isdir=1" target="_blank">over there</a>.
+                                               and a little bit more detailed <a href="http://svn.ipfire.org/log.php?repname=ipfire&amp;path=%2F&amp;rev=0&amp;sc=1&amp;isdir=1" target="_blank">over there</a>.
                                        </p>
                                        
                                        <div align="right">
                                                <a href="http://download.ipfire.org/torrent/ipfire-2.0rc1.i586-full.iso.torrent">IPFire 2.0 RC 1 - TORRENT</a><br />
-                                               <a href="http://download.ipfire.org/iso/ipfire-2.0rc1.i586-full.iso">IPFire 2.0 RC 1 - Mirror 1</a><br />
-                                               <a href="http://mirror2.ipfire.org/iso/ipfire-2.0rc1.i586-full.iso">IPFire 2.0 RC 1 - Mirror 2</a><br />
-                                               <a href="http://www.rowie.at/ipfire/ipfire-2.0rc1.i586-full.iso">IPFire 2.0 RC 1 - Mirror 3</a><br />
-                                               <a href="http://ipfire.earl-net.com/ipfire-2.0rc1.i586-full.iso">IPFire 2.0 RC 1 - Mirror 4</a>
+                                               <a href="http://download.ipfire.org/iso/ipfire-2.0rc1.i586-full.iso">IPFire 2.0 RC 1 - HTTP</a>
                                        </div>
 
                                </div>
@@ -86,15 +106,12 @@
                                        <p>
                                                Exactly one month after the beta 1 the beta 2 is available for download.<br />
                                                The changelog is <a href="http://wiki.ipfire.org/index.php/BETA:2" target="_blank">here</a>
-                                               and a little bit more detailed <a href="http://svn.ipfire.org/log.php?repname=ipfire&path=%2F&rev=0&sc=1&isdir=1" target="_blank">over there</a>.
+                                               and a little bit more detailed <a href="http://svn.ipfire.org/log.php?repname=ipfire&amp;path=%2F&amp;rev=0&amp;sc=1&amp;isdir=1" target="_blank">over there</a>.
                                        </p>
                                        
                                        <div align="right">
                                                <a href="http://download.ipfire.org/torrent/ipfire-2.0beta2.i586-full.iso.torrent">IPFire 2.0 Beta 2 - TORRENT</a><br />
-                                               <a href="http://download.ipfire.org/iso/ipfire-2.0beta2.i586-full.iso">IPFire 2.0 Beta 2 - Mirror 1</a><br />
-                                               <a href="http://mirror2.ipfire.org/iso/ipfire-2.0beta2.i586-full.iso">IPFire 2.0 Beta 2 - Mirror 2</a><br />
-                                               <a href="http://www.rowie.at/ipfire/ipfire-2.0beta2.i586-full.iso">IPFire 2.0 Beta 2 - Mirror 3</a><br />
-                                               <a href="http://ipfire.earl-net.com/ipfire-2.0beta2.i586-full.iso">IPFire 2.0 Beta 2 - Mirror 4</a>
+                                               <a href="http://download.ipfire.org/iso/ipfire-2.0beta2.i586-full.iso">IPFire 2.0 Beta 2 - HTTP</a>
                                        </div>
 
                                </div>
@@ -135,10 +152,7 @@
                                        
                                        <div align="right">
                                                <a href="http://download.ipfire.org/torrent/ipfire-2.0beta1.i586-full.iso.torrent">IPFire 2.0 Beta 1 - TORRENT</a><br />
-                                               <a href="http://download.ipfire.org/iso/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 1</a><br />
-                                               <a href="http://mirror2.ipfire.org/iso/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 2</a><br />
-                                               <a href="http://www.rowie.at/ipfire/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 3</a><br />
-                                               <a href="http://ipfire.earl-net.com/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - Mirror 4</a>
+                                               <a href="http://download.ipfire.org/iso/ipfire-2.0beta1.i586-full.iso">IPFire 2.0 Beta 1 - HTTP</a>
                                        </div>
                                        
                                        <h4>in the press:</h4>

diff --git a/en/index.shtml b/en/index.shtml
index 291b71118a2c30f269e08fc1c71f786c496d5591..4e3b03873457c0617ac7789da6a9be86776333c4 100644 (file)
--- a/en/index.shtml
+++ b/en/index.shtml
@@ -30,61 +30,18 @@
                                
                                <div class="post">
                                
-                                       <h3>2007/10/14 - Release Candidate 1</h3>
+                                       <h3>2007/10/28 - Release Candidate 2</h3>
                                        <ul class="post_info">
-                                               <li class="date">Check it out</li>
+                                               <li class="date">3, 2, 1, it's mine...</li>
                                        </ul>                                   
                                        <p>
                                                <b>Hey Community!</b><br />
-                                                       We released the first RC today. It´s linked in the download section.<br /><br />
-                                                       <b>You can get some information from the german Changelog 
-                                                               <a href="http://wiki.ipfire.org/index.php/RC:1" target="_blank">german Changelog</a>!</b>
+                                                       We released the first RC today. It's linked in the download section.
                                                        <br /><br /><b>Mitch</b> - for the developers on IPFire.org
                                        </p>
                                </div>                          
                                
                                <br class="clear" />
-                               
-                               <div class="post">
-                               
-                                       <h3>2007/09/24 - Beta 2</h3>
-                                       <ul class="post_info">
-                                               <li class="date">1:0 ahead - Halftime</li>
-                                       </ul>                                   
-                                       <p>
-                                               <b>Hey Community!</b><br />
-                                                       We released another BETA version. It´s linked in the download section.<br /><br />
-                                                       <b>You can get some information from the german Changelog 
-                                                               <a href="http://wiki.ipfire.org/index.php/BETA:2" target="_blank">german Changelog</a>!</b>
-                                                       <br /><br /><b>Christian</b> - for the developers on IPFire.org
-                                       </p>
-                               </div>
-                       
-                               <div class="post">
-                               
-                                       <h3>2007/08/24 - Beta 1</h3>
-                                       <ul class="post_info">
-                                               <li class="date">Posted by <a href="#">Michael Tremer</a> on 2007/08/24</li>
-                                               <li class="comments"><a href="#">0 comments</a></li>
-                                       </ul>                                   
-                                       <p>
-                                               <b>Hey Community!</b><br />
-                                                       After a long time of development and testing, me and my team are pround to announce
-                                                       that the first beta version of the IPFire firewall is finished.<br />
-                                                       When version 1.4.9 was based on IPCop, we did a complete rewrite of the
-                                                       distribution and now everything is based on Linux-from-Scratch (LFS) 6.2.<br />
-                                                       One of the hardest tasks to do was the integration of the linux kernel 2.6, what
-                                                       lead to deep changes in the system. The webinterface resembels to the predecessor
-                                                       but we have done a lot of work beyond the cap. I call it "a little revolution".
-                                                       But the result is a current and hardened system with gcc-4.0.3 and the stable kernel
-                                                       tree 2.6.16.<br /><br />
-                                                       
-                                                       <b>You can read more in our 
-                                                               <a href="../data/ipfire-press-release-beta-1.pdf" target="_blank">press release (german)</a>!</b>
-                                                       
-                                                       <br /><br /><b>Michael</b> - for the developers on IPFire.org
-                                       </p>
-                               </div>
                
                        </div>
        

diff --git a/footer.shtml b/footer.shtml
index a2a5d2355bc391128062cf73e6667a38d9c2159d..6792d820bad4eadaa769cbdb584579574b44b1e4 100644 (file)
--- a/footer.shtml
+++ b/footer.shtml
@@ -1,5 +1,5 @@
 <div id="footer" class="fixed">
-       <img src="http://www.ipligence.com/webmaps/m/?u=5feee836062786c9a5ca20e179302b42&amp;size=medium&amp;color=1&amp;a=year" alt="ip-<br>location map zoom" border="1" />
+       <img src="http://www.ipligence.com/webmaps/m/?u=5feee836062786c9a5ca20e179302b42&amp;size=medium&amp;color=1&amp;a=year" alt="ip-location map zoom" border="1" />
        <br /><br />Copyright &copy; 2007 IPFire.org. All rights reserved.
 </div>
 

diff --git a/header.shtml b/header.shtml
index 9580b83b8a5daa774b4ebdb5a0512826b20a4996..64b0eb3007756c96d25ecc3602c30868b12fcd88 100644 (file)
--- a/header.shtml
+++ b/header.shtml
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
 <head>
        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
        <title>www.ipfire.org</title>