From 8b0967105228311eb59b23049d996cdb6438d72f Mon Sep 17 00:00:00 2001
From: Jonah Aragon <jonah@triplebit.net>
Date: Wed, 24 May 2023 20:36:14 -0500
Subject: [PATCH] Fix security.txt (#2170)

---
 netlify.toml                                        |   4 ++--
 _redirects => static/_redirects                     |   1 +
 .../openpgpkey/hu/dnrefmbtd6i58w8xfy4imj94cmbw3u3h  | Bin
 .../well-known}/openpgpkey/policy                   |   0
 .../.well-known => static/well-known}/security.txt  |   0
 5 files changed, 3 insertions(+), 2 deletions(-)
 rename _redirects => static/_redirects (99%)
 rename {theme/.well-known => static/well-known}/openpgpkey/hu/dnrefmbtd6i58w8xfy4imj94cmbw3u3h (100%)
 rename {theme/.well-known => static/well-known}/openpgpkey/policy (100%)
 rename {theme/.well-known => static/well-known}/security.txt (100%)

diff --git a/netlify.toml b/netlify.toml
index 314fddf6..4ffcecb4 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -20,10 +20,10 @@
 
 [build]
     publish = "site/"
-    command = "crowdin download && mkdocs build --config-file config/mkdocs.en.yml && mkdocs build --config-file config/mkdocs.es.yml && mkdocs build --config-file config/mkdocs.he.yml && mkdocs build --config-file config/mkdocs.fr.yml && mkdocs build --config-file config/mkdocs.nl.yml && mv _redirects site/"
+    command = "crowdin download && mkdocs build --config-file config/mkdocs.en.yml && mkdocs build --config-file config/mkdocs.es.yml && mkdocs build --config-file config/mkdocs.he.yml && mkdocs build --config-file config/mkdocs.fr.yml && mkdocs build --config-file config/mkdocs.nl.yml && mv static/* site/"
 
     [context.deploy-preview]
-        command = "mkdocs build --config-file config/mkdocs.en.yml && mv _redirects site/"
+        command = "mkdocs build --config-file config/mkdocs.en.yml && mv static/* site/"
 
 [[headers]]
   for = "/*"
diff --git a/_redirects b/static/_redirects
similarity index 99%
rename from _redirects
rename to static/_redirects
index 8e0af82a..ec34af73 100644
--- a/_redirects
+++ b/static/_redirects
@@ -26,6 +26,7 @@
 /  /en/  302
 
 /.well-known/matrix/* https://matrix.privacyguides.org/.well-known/matrix/:splat 200
+/.well-known/* /well-known/:splat 200
 
 /kb /en/basics/why-privacy-matters/
 /:lang/kb /:lang/basics/why-privacy-matters/
diff --git a/theme/.well-known/openpgpkey/hu/dnrefmbtd6i58w8xfy4imj94cmbw3u3h b/static/well-known/openpgpkey/hu/dnrefmbtd6i58w8xfy4imj94cmbw3u3h
similarity index 100%
rename from theme/.well-known/openpgpkey/hu/dnrefmbtd6i58w8xfy4imj94cmbw3u3h
rename to static/well-known/openpgpkey/hu/dnrefmbtd6i58w8xfy4imj94cmbw3u3h
diff --git a/theme/.well-known/openpgpkey/policy b/static/well-known/openpgpkey/policy
similarity index 100%
rename from theme/.well-known/openpgpkey/policy
rename to static/well-known/openpgpkey/policy
diff --git a/theme/.well-known/security.txt b/static/well-known/security.txt
similarity index 100%
rename from theme/.well-known/security.txt
rename to static/well-known/security.txt