Merge branch 'dynamic_mirror'

diff --git a/download/mirrors/index.html.tt2 b/download/mirrors/index.html.tt2
index fa6f856..556fe82 100644 (file)
--- a/download/mirrors/index.html.tt2
+++ b/download/mirrors/index.html.tt2
@@ -43,116 +43,23 @@
             <ul>
               <li><a href="http://download.grml.org/">http://download.grml.org/</a></li>
             </ul>
+           [% FOREACH region IN mirrors.keys.sort %]
+               <h3>Mirrors in [% region.substr(3) %] </h3>
+
+               [% FOREACH mirror IN mirrors.$region.keys.sort %]
+               <p>[% mirror %] ([% mirrors.$region.$mirror.location %])</p>
+               [% FOREACH type IN [ 'grml-http' 'grml-rsync' 'grml-ftp' ] %]
+               <ul>
+            <li><a href="[% type.substr(5) %]://[% mirror %][ mirrors.$region.$mirror.$type %]">
+                [% type.substr(5) %]://[% mirror %][ mirrors.$region.$mirror.$type %]
+                </a>
+            </li>
+               </ul>
+               [% END %]
+               [% END %]
+           [% END %]
 
-            <h3>Mirrors in Europe</h3>
 
-            <p>sil.at (Vienna/Austria):</p>
-            <ul>
-              <li><a href="http://grml.deb.at/">http://grml.deb.at/</a></li>
-            </ul>
-
-            <p>inode.at (Vienna/Austria):</p>
-            <ul>
-              <li><a href="http://mirror.inode.at/data/grml/">http://mirror.inode.at/data/grml/</a></li>
-              <li><a href="ftp://mirror.inode.at/grml/">ftp://mirror.inode.at/grml/</a></li>
-            </ul>
-
-            <p>gd.tuwien.ac.at (Vienna/Austria):</p>
-            <ul>
-               <li><a href="http://gd.tuwien.ac.at/opsys/linux/grml/">http://gd.tuwien.ac.at/opsys/linux/grml/</a></li>
-               <li><a href="ftp://gd.tuwien.ac.at/opsys/linux/grml/">ftp://gd.tuwien.ac.at/opsys/linux/grml/</a></li>
-            </ul>
-
-<!--
-            <p>mirror.lagis.at (Linz/Austria):</p>
-
-            <ul>
-               <li><a href="http://mirror.lagis.at/pub/grml/">http://mirror.lagis.at/pub/grml/</a></li>
-               <li><a href="ftp://mirror.lagis.at/pub/grml/">ftp://mirror.lagis.at/pub/grml/</a></li>
-            </ul>
--->
-
-            <p>netcologne.de (Germany):</p>
-            <ul>
-              <li><a href="http://debian.netcologne.de/grml/">http://debian.netcologne.de/grml/</a></li>
-              <li><a href="ftp://debian.netcologne.de/grml/">ftp://debian.netcologne.de/grml/</a></li>
-            </ul>
-
-<!--
-            <p>uni-erlangen.de (Erlangen/Germany):</p>
-            <ul>
-              <li><a href="http://ftp.uni-erlangen.de/pub/mirrors/grml/">http://ftp.uni-erlangen.de/pub/mirrors/grml/</a></li>
-              <li><a href="ftp://ftp.uni-erlangen.de/pub/mirrors/grml/">ftp://ftp.uni-erlangen.de/pub/mirrors/grml/</a></li>
-            </ul>
--->
-
-            <p>GWDG.de (Germany):</p>
-            <ul>
-              <li><a href="http://ftp.gwdg.de/pub/linux/grml/">http://ftp.gwdg.de/pub/linux/grml/</a></li>
-              <li><a href="ftp://ftp.gwdg.de/pub/linux/grml/">ftp://ftp.gwdg.de/pub/linux/grml/</a></li>
-            </ul>
-
-            <p>rwth-aachen.de (Germany):</p>
-            <ul>
-                <li><a href="http://ftp.halifax.rwth-aachen.de/grml/">http://ftp.halifax.rwth-aachen.de/grml/</a></li>
-                <li><a href="ftp://ftp.halifax.rwth-aachen.de/grml/">ftp://ftp.halifax.rwth-aachen.de/grml/</a></li>
-            </ul>
-
-            <p>modprobe.de (Germany):</p>
-            <ul>
-              <li><a href="http://modprobe.de/grml/">http://modprobe.de/grml/</a></li>
-            </ul>
-
-<!--
-            <p>hosteurope.de (Germany):</p>
-            <ul>
-              <li><a href="http://ftp.hosteurope.de/mirror/grml.org/">http://ftp.hosteurope.de/mirror/grml.org/</a></li>
-              <li><a href="ftp://ftp.hosteurope.de/mirror/grml.org/">ftp://ftp.hosteurope.de/mirror/grml.org/</a></li>
-            </ul>
--->
-
-            <p>de.leaseweb.net (Germany):</p>
-            <ul>
-              <li><a href="http://mirror.de.leaseweb.net/grml/">http://mirror.de.leaseweb.net/grml/</a></li>
-              <li><a href="ftp://mirror.de.leaseweb.net/grml/">ftp://mirror.de.leaseweb.net/grml/</a></li>
-           </ul>
-
-            <p>nl.leaseweb.net (Haarlem/Netherlands):</p>
-            <ul>
-              <li><a href="http://mirror.nl.leaseweb.net/grml/">http://mirror.nl.leaseweb.net/grml/</a></li>
-              <li><a href="ftp://mirror.nl.leaseweb.net/grml/">ftp://mirror.nl.leaseweb.net/grml/</a></li>
-              <li><a href="rsync://mirror.nl.leaseweb.net/grml/">rsync://mirror.nl.leaseweb.net/grml/</a></li>
-            </ul>
-
-
-            <h3>Mirrors in America</h3>
-
-            <p>rit.edu (New York/US):</p>
-            <ul>
-              <li><a href="http://mirror.rit.edu/grml/">http://mirror.rit.edu/grml/</a></li>
-            </ul>
-
-            <h3>Mirrors in Brazil</h3>
-
-            <p>grml.c3sl.ufpr.br (Brazil):</p>
-
-            <ul>
-                <li><a href="http://grml.c3sl.ufpr.br">http://grml.c3sl.ufpr.br</a></li>
-                <li><a href="ftp://grml.c3sl.ufpr.br/grml">ftp://grml.c3sl.ufpr.br/grml</a></li>
-                <li><a href="rsync://grml.c3sl.ufpr.br/grml">rsync://grml.c3sl.ufpr.br/grml</a></li>
-            </ul>
-
-            <h2><a name="#rsync"></a>Download via rsync</h2>
-
-            <ul>
-              <li><a href="rsync://grml.deb.at/grml">rsync://grml.deb.at/grml</a></li>
-              <li><a href="rsync://ftp5.gwdg.de/pub/linux/grml/">rsync://ftp5.gwdg.de/pub/linux/grml/</a></li>
-              <li><a href="rsync://gd.tuwien.ac.at/opsys/linux/grml/">rsync://gd.tuwien.ac.at/opsys/linux/grml/</a></li>
-              <li><a href="rsync://ftp.halifax.rwth-aachen.de/grml/">rsync://ftp.halifax.rwth-aachen.de/grml/</a></li>
-              <li><a href="rsync://ftp.tw.debian.org/pub/grml/">rsync://ftp.tw.debian.org/pub/grml/</a></li>
-              <li><a href="rsync://mirror.de.leaseweb.net/grml/">rsync://mirror.de.leaseweb.net/grml/</a></li>
-              <li><a href="rsync://grml.c3sl.ufpr.br/grml">rsync://grml.c3sl.ufpr.br/grml</a></li>
-            </ul>
 
             <hr />
 

diff --git a/gen_website b/gen_website
index 7069102..6204a12 100755 (executable)
--- a/gen_website
+++ b/gen_website
@@ -10,7 +10,50 @@ use File::Basename qw (fileparse dirname);
 use File::Copy::Recursive qw(fcopy dirmove);
 use File::Temp qw (tempdir);
 
+use lib '/usr/share/perl5/';
+use Mirmon::Mirmon;
+
+my $m = Mirmon ->new('/etc/mirmon.conf');
+my $conf  = $m->conf  ; # a Mirmon::Conf object
+my $state = $m->state ; # the mirmon state
+
+
 my $out_dir = shift || "out/";
+my $masterlist = '/usr/local/src/grml-mirrors/Mirrors.masterlist';
+
+open (my $fh, '<', $masterlist) or die "Could not open $masterlist: $!";
+my $mirrors; 
+
+sub get_last_state ($) {
+       my $url = shift;
+       my $mirror_state = $state->{ $url } ; # a Mirmon::Mirror object
+       my ($time, $history) = split('-', $mirror_state->{state_history});
+       my $last_state = substr($history,-1,1);
+       return $last_state;
+}
+
+
+my $data;
+while (my $line = <$fh>) {
+    chomp $line;
+    if ($line =~ /([^:]+): (.*)/) {
+        my $key = lc($1);
+        my $value = $2;
+        $data->{$key} = $value;
+    } elsif ($line eq '') {
+       my $url = sprintf ("http://%s%s", $data->{'site'}, $data->{'grml-http'});
+               next if get_last_state($url) eq 'f';
+       $mirrors->{ $data->{'country'} }->{ $data->{'site'} } = $data;
+        $data = undef;
+    } else {
+        print "Malformed line: $line\n";
+    }
+}
+
+if ($data) {
+       my $url = sprintf ("http://%s%s", $data->{'site'}, $data->{'grml-http'});
+       $mirrors->{ $data->{'country'} }->{ $data->{'site'} } = $data if get_last_state($url) eq 'f';
+}
 
 #find all files
 
@@ -41,7 +84,7 @@ foreach my $file (@files) {
        next if $file =~ /$0$/;
        if ($file =~ /\.tt2$/) {
                my $output;
-               $template->process($file, undef, \$output)
+               $template->process($file, { mirrors => $mirrors }, \$output)
                        || die "Could not process file \"$file\": $!";
 
                my ($name,$path,$suffix) = fileparse($file,qw (.tt2));