Added information about the bittorrent tracker.

diff --git a/tracker b/tracker
new file mode 120000 (symlink)
index 0000000..baf12b4
--- /dev/null
+++ b/tracker
@@ -0,0 +1 @@
+www
\ No newline at end of file

diff --git a/www/de/index.shtml b/www/de/index.shtml
index 2702b547fd0c603bd846ae1f8a3cd01d89dbb83a..2395016b645e33379845b81ac1b78d7743f32bc1 100644 (file)
--- a/www/de/index.shtml
+++ b/www/de/index.shtml
@@ -100,7 +100,8 @@
        
                                <h4><span>Special</span> Links</h4>
                                <ul class="links">
-                                       <li class="first"><a href="final.shtml">Screenshots</a></li>
+                                       <li class="first"><a href="tracker.shtml">IPFireTracker</a></li>
+                                       <li><a href="final.shtml">Screenshots</a></li>
                                        <li><a href="http://wiki.ipfire.org/Addons" target="_blank">Addon-Übersicht</a></li>
                                        <li><a href="art.shtml">Art</a></li>
                                </ul>

diff --git a/www/de/source.shtml b/www/de/source.shtml
index 6af67187819694490b3b65354f0f05959cc369ce..abc6625fd92a246b14ffb14498fc26cb301be114 100644 (file)
--- a/www/de/source.shtml
+++ b/www/de/source.shtml
@@ -25,7 +25,7 @@
                                                <li class="date">Wie sieht's aus?</li>
                                        </ul>                                   
                                        <p>
-<!--#exec cmd="for i in $(ls -1 --hide=*.md5 ../source-3.0); do echo -e \"\t\t\t\t\t\t<a href=\\"/source-3.0/$i\\">$i</a><br />\"; done" -->
+<!--#exec cmd="for i in $(ls -1 --hide=*.md5 ../../source/source-3.x); do echo -e \"\t\t\t\t\t\t<a href=\\"/download/$i\\">$i</a><br />\"; done" -->
                                        </p>
                                </div>
                                
@@ -38,7 +38,7 @@
                                                <li class="date">Wie sieht's aus?</li>
                                        </ul>                                   
                                        <p>
-<!--#exec cmd="for i in $(ls -1 --hide=*.md5 ../othersrc); do echo -e \"\t\t\t\t\t\t<a href=\\"/othersrc/$i\\">$i</a><br />\"; done" -->
+<!--#exec cmd="for i in $(ls -1 --hide=*.md5 ../../source/source-2.x); do echo -e \"\t\t\t\t\t\t<a href=\\"/source-2.x/$i\\">$i</a><br />\"; done" -->
                                        </p>
                                </div>
                                
@@ -61,7 +61,7 @@
                                <h4><span>Development</span> Zone</h4>
                                <ul class="links">
                                        <li class="first"><a href="http://bugtracker.ipfire.org/">Bugtracker</a></li>
-                                       <li><a href="http://svn.ipfire.org">WebSubversion</a></li>
+                                       <li><a href="http://git.ipfire.org">Git</a></li>
                                        <li><a href="http://source.ipfire.org">SourceCodeCenter</a></li>
                                </ul>
 

diff --git a/www/de/tracker.shtml b/www/de/tracker.shtml
new file mode 100644 (file)
index 0000000..1a4fb94
--- /dev/null
+++ b/www/de/tracker.shtml
@@ -0,0 +1,78 @@
+<!--#include virtual="../header.shtml" -->
+
+<div id="main">
+
+       <div id="main_inner" class="fixed">
+
+               <div id="primaryContent_2columns">
+
+                       <div id="columnA_2columns">
+               
+                               <h3>Tracker</h3>
+                               <img src="../images/download.png" class="floatTL" alt="Download" />
+
+                               <p>
+                                       Hier findet ihr Informationen über den Torrent-Tracker von IPFire,
+                                       welcher zur Verteilung der Distribution dient.<br />
+                                       Die Download-Links für die IPFire-Torrents finden sich auf der
+                                       <a href="downloads.shtml">Downloadseite</a>.
+                               </p>
+                               
+                               <p>
+                                       Der IPFire-Tracker basiert auf
+                                       <a href="http://erdgeist.org/arts/software/opentracker/" target="_blank">OpenTracker</a>
+                                       und stellt die IPFire-Downloads zu Verfügung.<br />
+                                       Gleichzeitig soll er auch für die OpenSource-Community nutzbar sein,
+                                       und für andere Projekte seine treuen Dienste erledigen. 
+                               </p>
+                               
+                               <p>
+                                       Wer an der Nutzung interessiert ist, kann uns unter
+                                       <a href="mailto:tracker@ipfire.org">tracker@ipfire.org</a>
+                                       erreichen.
+                               </p>
+                               
+                               <p>
+                                       <b>URL:</b> <i>http://tracker.ipfire.org:6969/announce</i>
+                               </p>
+                               
+                               <br class="clear" />
+               
+                       </div>
+       
+               </div>
+               
+               <div id="secondaryContent_2columns">
+               
+                       <div id="columnC_2columns">
+                       
+                               <h4><span>Other</span> Tools</h4>
+                               <ul class="links">
+                                       <li class="first"><a href="http://wiki.ipfire.org/Tools:Windows">Windows</a></li>
+                                       <li><a href="http://wiki.ipfire.org/Tools:Linux">Linux</a></li>
+                                       <li><a href="http://wiki.ipfire.org/Tools:Mac_OS">Mac OS</a></li>
+                               </ul>
+                               
+                               <h4><span>Torrent</span> Clients</h4>
+                               <ul class="links">
+                                       <li class="first"><b>Common</b></li>
+                                       <li><a href="http://azureus.sourceforge.net/" target="_blank">Azureus</a></li>
+                                       <li><b>Windows</b></li>
+                                       <li><a href="http://www.utorrent.com/" target="_blank">µtorrent</a></li>
+                                       <li><a href="http://pingpong-abc.sourceforge.net/" target="_blank">ABC torrent</a></li>
+                                       <li><b>Linux</b></li>
+                                       <li><a href="http://ktorrent.org/" target="_blank">ktorrent</a></li>
+                                       <li><b>MacOS</b></li>
+                                       <li><a href="http://www.bitsonwheels.com/" target="_blank">Bits on Wheels</a></li>
+                               </ul>
+                       </div>
+
+               </div>
+
+               <br class="clear" />
+
+       </div>
+
+</div>
+
+<!--#include virtual="../footer.shtml" -->

diff --git a/www/en/index.shtml b/www/en/index.shtml
index 8158af17ed1c8ca392edce44764ca7553f16b657..10768b6e851f10086fdccc2c94c4831b1bb8155b 100644 (file)
--- a/www/en/index.shtml
+++ b/www/en/index.shtml
@@ -100,7 +100,8 @@
 
                                <h4><span>Special</span> Links</h4>
                                <ul class="links">
-                                       <li class="first"><a href="final.shtml">Screenshots</a></li>
+                                       <li class="first"><a href="tracker.shtml">IPFireTracker</a></li>
+                                       <li><a href="final.shtml">Screenshots</a></li>
                                        <li><a href="art.shtml">Art</a></li>
                                </ul>
                                

diff --git a/www/en/source.shtml b/www/en/source.shtml
index c0d3e947ebb96b9c8ed67d6750951a8cfd271740..1f39f16d19fc994e9abed06ef4be152069b8660f 100644 (file)
--- a/www/en/source.shtml
+++ b/www/en/source.shtml
@@ -62,7 +62,7 @@
                                <h4><span>Development</span> Zone</h4>
                                <ul class="links">
                                        <li class="first"><a href="http://bugtracker.ipfire.org/">Bugtracker</a></li>
-                                       <li><a href="http://svn.ipfire.org">WebSubversion</a></li>
+                                       <li><a href="http://git.ipfire.org">Git</a></li>
                                        <li><a href="http://source.ipfire.org">SourceCodeCenter</a></li>
                                </ul>
 

diff --git a/www/en/tracker.shtml b/www/en/tracker.shtml
new file mode 100644 (file)
index 0000000..b7e6aff
--- /dev/null
+++ b/www/en/tracker.shtml
@@ -0,0 +1,78 @@
+<!--#include virtual="../header.shtml" -->
+
+<div id="main">
+
+       <div id="main_inner" class="fixed">
+
+               <div id="primaryContent_2columns">
+
+                       <div id="columnA_2columns">
+               
+                               <h3>Tracker</h3>
+                               <img src="../images/download.png" class="floatTL" alt="Download" />
+
+                               <p>
+                                       This is the page of the ipfire torrent tracker
+                                       which is used for distribution of the large iso files.<br />
+                                       If you are searching for the ipfire download see the
+                                       <a href="downloads.shtml">download</a> page.
+                               </p>
+                               
+                               <p>
+                                       Based on
+                                       <a href="http://erdgeist.org/arts/software/opentracker/" target="_blank">OpenTracker</a>
+                                       the ipfire tracker doesn't only provide the ipfire downloads.
+                                       It also can be used by the whole open source community
+                                       for distributing its files. 
+                               </p>
+                               
+                               <p>
+                                       Who is interested in using this tracker
+                                       may send a mail to
+                                       <a href="mailto:tracker@ipfire.org">tracker@ipfire.org</a>.
+                               </p>
+                               
+                               <p>
+                                       <b>URL:</b> <i>http://tracker.ipfire.org:6969/announce</i>
+                               </p>
+                               
+                               <br class="clear" />
+               
+                       </div>
+       
+               </div>
+               
+               <div id="secondaryContent_2columns">
+               
+                       <div id="columnC_2columns">
+                       
+                               <h4><span>Other</span> Tools</h4>
+                               <ul class="links">
+                                       <li class="first"><a href="http://wiki.ipfire.org/Tools:Windows">Windows</a></li>
+                                       <li><a href="http://wiki.ipfire.org/Tools:Linux">Linux</a></li>
+                                       <li><a href="http://wiki.ipfire.org/Tools:Mac_OS">Mac OS</a></li>
+                               </ul>
+                               
+                               <h4><span>Torrent</span> Clients</h4>
+                               <ul class="links">
+                                       <li class="first"><b>Common</b></li>
+                                       <li><a href="http://azureus.sourceforge.net/" target="_blank">Azureus</a></li>
+                                       <li><b>Windows</b></li>
+                                       <li><a href="http://www.utorrent.com/" target="_blank">µtorrent</a></li>
+                                       <li><a href="http://pingpong-abc.sourceforge.net/" target="_blank">ABC torrent</a></li>
+                                       <li><b>Linux</b></li>
+                                       <li><a href="http://ktorrent.org/" target="_blank">ktorrent</a></li>
+                                       <li><b>MacOS</b></li>
+                                       <li><a href="http://www.bitsonwheels.com/" target="_blank">Bits on Wheels</a></li>
+                               </ul>
+                       </div>
+
+               </div>
+
+               <br class="clear" />
+
+       </div>
+
+</div>
+
+<!--#include virtual="../footer.shtml" -->

diff --git a/www/index.pl b/www/index.pl
index 22ab6abd8d4c40decf530f26ce0d91171195a9c4..746e2634cf71e2e608f34f1934ff7f54c177665c 100755 (executable)
--- a/www/index.pl
+++ b/www/index.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 
 my $lang = "en";
-my @error;
 
 # Set language to german, else use english site
 if ($ENV{'HTTP_ACCEPT_LANGUAGE'} =~ /^de(.*)/) {
@@ -13,8 +12,10 @@ print "Pragma: no-cache\n";
 
 if ($ENV{'SERVER_NAME'} eq "source.ipfire.org") {
        print "Location: /$lang/source.shtml\n";
+} elsif ($ENV{'SERVER_NAME'} eq "tracker.ipfire.org") {
+       print "Location: /$lang/tracker.shtml\n";
 } else {
-       print "Location: /$lang/index.shtml\n";
+       print "Location: http://www.ipfire.org/$lang/index.shtml\n";
 }
 
 # End http header...