[web] master update

[Richard Levitte]

The branch master has been updated
       via  74867be941560c563f86ab901d89f124e183e31c (commit)
       via  18e3d3119a4c74dcf50ed0d3418efd40bf811c28 (commit)
      from  47a7a6de93b5fd3f1fd73b638d4119d2ca55a61f (commit)


- Log -----------------------------------------------------------------
commit 74867be941560c563f86ab901d89f124e183e31c
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Oct 22 14:50:57 2021 +0200

    Reduce bin/mk-latest to only redirect latest
    
    We rely on the system apache configuration for aliasing to /srv/ftp
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/web/pull/272)

commit 18e3d3119a4c74dcf50ed0d3418efd40bf811c28
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Oct 22 14:49:58 2021 +0200

    Switch the release directory to /srv/ftp/source
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/web/pull/272)

-----------------------------------------------------------------------

Summary of changes:
 Makefile      |  2 +-
 bin/mk-latest | 38 +++-----------------------------------
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/Makefile b/Makefile
index 83d8e53..0f79120 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ CHECKOUTS = /var/cache/openssl/checkouts
 ##  Snapshot directory
 SNAP = $(CHECKOUTS)/openssl
 ## Where releases are found.
-RELEASEDIR = /var/www/openssl/source
+RELEASEDIR = /srv/ftp/source
 
 ## The OMC repository checkout can be used for dependencies.
 ## By default, we don't assume it, as not everyone has access to it.
diff --git a/bin/mk-latest b/bin/mk-latest
index 8a43268..88ef087 100755
--- a/bin/mk-latest
+++ b/bin/mk-latest
@@ -24,41 +24,9 @@ print <<"EOF";
 # Instead, edit bin/mk-latest in the master branch of openssl-web.git
 #####
 
-RewriteEngine on
-RewriteBase /source
-# First, rewrite all the 'latest' URLs
-RewriteRule ^latest.tar.gz\$ $latest [L,R=302,NC]
+Redirect "/source/latest.tar.gz" "/source/$latest"
 EOF
 
-foreach (sort keys %series) {
-	my $rule = "openssl-$_-latest.tar.gz";
-	#don't bother: $rule =~ s|\.|\\.|g;
-	my $target = $series{$_};
-	print "RewriteRule ^$rule\$ $target [L,R=302,NC]\n";
-}
-
-print <<\EOF;
-
-# Old distro's are in subdirs.
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(openssl-0\.9\.\d.*) old/0.9.x/$1 [L]
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(openssl-3\.(\d+).*) old/3.$2/$1 [L]
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(openssl-(\d+\.\d+\.\d+).*) old/$2/$1 [L]
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^openssl-(fips.*)  old/fips/openssl-$1 [L]
-
-<Files *.gz.asc>
-    RemoveEncoding .gz
-</Files>
-<Files *.gz.md5>
-    RemoveEncoding .gz
-</Files>
-<Files *.gz.sha1>
-    RemoveEncoding .gz
-</Files>
-<Files *.gz.sha256>
-    RemoveEncoding .gz
-</Files>
+print <<"EOF" foreach (sort keys %series);
+Redirect "/source/openssl-$_-latest.tar.gz" "/source/$series{$_}"
 EOF