[openssl-commits] [web] master update

[Rich Salz]

The branch master has been updated
       via  b4ff83c2d59972634c1fb5cec296e8b4b4217c55 (commit)
      from  89738db3a78e48c58284fa9f69abcbbf56a1b4cc (commit)


- Log -----------------------------------------------------------------
commit b4ff83c2d59972634c1fb5cec296e8b4b4217c55
Author: Rich Salz <rsalz at akamai.com>
Date:   Sat Aug 15 14:33:52 2015 -0400

    CLA PDF's moved

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

Summary of changes:
 .htaccess                 |   3 +++
 bin/mk-sitemap            |   4 +++-
 licenses/openssl_ccla.pdf | Bin 37962 -> 0 bytes
 licenses/openssl_icla.pdf | Bin 37290 -> 0 bytes
 4 files changed, 6 insertions(+), 1 deletion(-)
 delete mode 100644 licenses/openssl_ccla.pdf
 delete mode 100644 licenses/openssl_icla.pdf

diff --git a/.htaccess b/.htaccess
index ac417dd..62a857a 100644
--- a/.htaccess
+++ b/.htaccess
@@ -4,6 +4,9 @@ RewriteEngine on
 
 Options +ExecCGI +FollowSymLinks
 
+RewriteRule licenses/openssl_ccla.pdf policies/openssl_ccla.pdf
+RewriteRule licenses/openssl_icla.pdf policies/openssl_icla.pdf
+
 <Files *.md5>
 ForceType application/binary
 </Files>
diff --git a/bin/mk-sitemap b/bin/mk-sitemap
index d53d3cb..ee76444 100755
--- a/bin/mk-sitemap
+++ b/bin/mk-sitemap
@@ -9,6 +9,8 @@ dodir()
     my @files = ();
     my @dirs = ();
 
+    return if $dir eq 'source/old' || $dir eq 'docs/fips';
+
     foreach my $entry ( glob($dir . "/*")) {
 	if (-f $entry ) {
 	    next unless $entry =~ m/.*\.(html|pdf|txt|png)$/;
@@ -26,7 +28,7 @@ dodir()
 
     foreach my $entry ( @dirs) {
 	$entry =~ s@^\.\/@@;
-	next if $entry =~ m/.git|inc|img|bin/;
+	next if $entry =~ m/.git|inc|img|bin|blog/;
 	next if $entry =~ m/secadv/;
 	my $simple = $entry;
 	$simple =~ s at .*/@@;
diff --git a/licenses/openssl_ccla.pdf b/licenses/openssl_ccla.pdf
deleted file mode 100644
index 031ed4c..0000000
Binary files a/licenses/openssl_ccla.pdf and /dev/null differ
diff --git a/licenses/openssl_icla.pdf b/licenses/openssl_icla.pdf
deleted file mode 100644
index 798b231..0000000
Binary files a/licenses/openssl_icla.pdf and /dev/null differ