Move Nginx TLS configuration files into a specific folder
diff --git a/certbot-nginx/MANIFEST.in b/certbot-nginx/MANIFEST.in
index 8707f9443f0..3a22c487320 100644
--- a/certbot-nginx/MANIFEST.in
+++ b/certbot-nginx/MANIFEST.in
@@ -2,5 +2,4 @@ include LICENSE.txt
 include README.rst
 recursive-include docs *
 recursive-include certbot_nginx/tests/testdata *
-include certbot_nginx/options-ssl-nginx.conf
-include certbot_nginx/options-ssl-nginx-old.conf
+recursive-include certbot_nginx/tls_configs *.conf
diff --git a/certbot-nginx/certbot_nginx/configurator.py b/certbot-nginx/certbot_nginx/configurator.py
index 4fd5056a33d..d3de8359373 100644
--- a/certbot-nginx/certbot_nginx/configurator.py
+++ b/certbot-nginx/certbot_nginx/configurator.py
@@ -129,7 +129,8 @@ def mod_ssl_conf_src(self):
             config_filename = "options-ssl-nginx-old.conf"
         elif self.version < (1, 13, 0):
             config_filename = "options-ssl-nginx-tls12-only.conf"
-        return pkg_resources.resource_filename("certbot_nginx", config_filename)
+        return pkg_resources.resource_filename(
+            "certbot_nginx", os.path.join("tls_configs", config_filename))
 
     @property
     def mod_ssl_conf(self):
diff --git a/certbot-nginx/certbot_nginx/tests/configurator_test.py b/certbot-nginx/certbot_nginx/tests/configurator_test.py
index 35113aa9847..8db2027856a 100644
--- a/certbot-nginx/certbot_nginx/tests/configurator_test.py
+++ b/certbot-nginx/certbot_nginx/tests/configurator_test.py
@@ -972,11 +972,12 @@ def test_ssl_config_files_hash_in_all_hashes(self):
         """
         from certbot_nginx.constants import ALL_SSL_OPTIONS_HASHES
         import pkg_resources
-        all_files = [pkg_resources.resource_filename("certbot_nginx", x) for x in (
-          "options-ssl-nginx.conf",
-          "options-ssl-nginx-old.conf",
-          "options-ssl-nginx-tls12-only.conf"
-          )]
+        all_files = [
+            pkg_resources.resource_filename("certbot_nginx", os.path.join("tls_configs", x))
+            for x in ("options-ssl-nginx.conf",
+                      "options-ssl-nginx-old.conf",
+                      "options-ssl-nginx-tls12-only.conf")
+        ]
         self.assertTrue(all_files)
         for one_file in all_files:
             file_hash = crypto_util.sha256sum(one_file)
diff --git a/certbot-nginx/certbot_nginx/options-ssl-nginx-old.conf b/certbot-nginx/certbot_nginx/tls_configs/options-ssl-nginx-old.conf
similarity index 100%
rename from certbot-nginx/certbot_nginx/options-ssl-nginx-old.conf
rename to certbot-nginx/certbot_nginx/tls_configs/options-ssl-nginx-old.conf
diff --git a/certbot-nginx/certbot_nginx/options-ssl-nginx-tls12-only.conf b/certbot-nginx/certbot_nginx/tls_configs/options-ssl-nginx-tls12-only.conf
similarity index 100%
rename from certbot-nginx/certbot_nginx/options-ssl-nginx-tls12-only.conf
rename to certbot-nginx/certbot_nginx/tls_configs/options-ssl-nginx-tls12-only.conf
diff --git a/certbot-nginx/certbot_nginx/options-ssl-nginx.conf b/certbot-nginx/certbot_nginx/tls_configs/options-ssl-nginx.conf
similarity index 100%
rename from certbot-nginx/certbot_nginx/options-ssl-nginx.conf
rename to certbot-nginx/certbot_nginx/tls_configs/options-ssl-nginx.conf

Following discussions in #7298.

This PR moves the three Nginx TLS configuration files into a specific folder, `tls_configs`, update the MANIFEST to include this folder and its content into the `certbot-nginx` package, and update tests accordingly.