Merge remote-tracking branch 'origin/github/pr/45'

[grml.org.git] / gen_website

diff --git a/gen_website b/gen_website
index a5933e5..7c26751 100755 (executable)
--- a/gen_website
+++ b/gen_website
@@ -20,7 +20,7 @@ my $fh;
 my $m;
 my $conf;
 my $state;
-if (eval {use Mirmon::Mirmon; 1 } && -f $masterlist && -f $mirmonconf) {
+if (eval {require Mirmon; 1 } && -f $masterlist && -f $mirmonconf) {
        $have_mirmon = 1;
        open ($fh, '<', $masterlist) or die "Could not open $masterlist: $!";
        $m = Mirmon ->new($mirmonconf);
@@ -52,7 +52,7 @@ while (($have_mirmon) && (my $line = <$fh>)) {
         my $value = $2;
         $data->{$key} = $value;
     } elsif ($line eq '') {
-       my $url = sprintf ("http://%s%s", $data->{'site'}, $data->{'grml-http'});
+       my $url = sprintf ("https://%s%s", $data->{'site'}, $data->{'grml-http'});
                next if get_last_state($url) eq 'f';
        $mirrors->{ $data->{'country'} }->{ $data->{'site'} } = $data;
         $data = undef;
@@ -62,7 +62,7 @@ while (($have_mirmon) && (my $line = <$fh>)) {
 }
 
 if ($data) {
-       my $url = sprintf ("http://%s%s", $data->{'site'}, $data->{'grml-http'});
+       my $url = sprintf ("https://%s%s", $data->{'site'}, $data->{'grml-http'});
        $mirrors->{ $data->{'country'} }->{ $data->{'site'} } = $data if get_last_state($url) eq 'f';
 }