Updating script and info on samba.org since samba.org

is automatically sent to us1.samba.org now.  Also,
remove the reirect page since it's no longer in use.

--deryck

git-svn-id: file:///home/svn/samba-web/trunk@452 44aeb9d7-1cd8-0310-b257-a505e0beeac2

diff --git a/index.html b/index.html
index 84f52ff8a539a8c73a0dd52823876661ab7b0c12..76a41609237b4d7813a57854b00a64ce73b26fd1 100755 (executable)
--- a/index.html
+++ b/index.html
@@ -59,11 +59,11 @@ alt="Samba t-shirt" /></a>
     </div>
   
     <div class="request">
-      <p>Visitors to http://samba.org/ are automatically redirected to one
-      of our mirrors.  If you'd like to change to a mirror closer to your 
-      location, you may choose a <span class="punch">mirror site</span> 
-      from the drop-down menu above. The popularity of Samba puts a strain on 
-      our network. By using a mirror site you can do your bit to reduce the load.</p>
+      <p>http://samba.org/ is automatically redirected to one of our US 
+      mirrors.  To change to a mirror closer to your location, choose a 
+      <span class="punch">mirror site</span> from the drop-down menu above.  
+      The popularity of Samba puts a strain on our network.  By using a 
+      mirror site you can do your bit to reduce the load.</p>
     </div>
 
 <!--#include virtual="/samba/footer.html" -->

diff --git a/scripts/js_redirect.py b/scripts/js_redirect.py
index afeae2fe60e418fc1f2c89ce46901e2a5d0a9163..e45cb91e16cebdd828679a082c0128d6583e18b9 100755 (executable)
--- a/scripts/js_redirect.py
+++ b/scripts/js_redirect.py
@@ -1,6 +1,6 @@
 #! /usr/bin/python
 
-# Create javascript for redirecting to a random mirror.
+# Create list of options for mirrors drop-down menu 
 
 import os, re
 
@@ -17,19 +17,6 @@ for line in hosts:
 mlist = mirrors.keys()
 mlist.sort()
 
-# For main samba.org redirect
-js = open('redirect_include.html', 'w')
-js.write('<script language="Javascript" type="text/javascript">\n')
-js.write('<!-- Hide from old browsers\n')
-js.write('randomMirror = new Array;\n')
-for i in range(len(mlist)):
-    js.write('randomMirror[' + str(i) + '] = ' + mlist[i] + '"\n')
-js.write('\n')
-js.write('n = Math.floor(Math.random()*' + str(len(mirrors.keys())) + ')\n')
-js.write('// end hide -->\n')
-js.write('</script>')
-js.close() 
-
 # For drop-down mirror selection list
 menu = open('menu_options.html', 'w')
 for m in mlist: