From 8bcb04af4a1aec87fa838283eb5c6a4e2d1a625c Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Tue, 6 Aug 2019 00:45:08 +0200 Subject: [PATCH] Move Nginx TLS configuration files into a specific folder (#7300) 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. * Move tls configuration files in a specific folder * Move new file --- certbot-nginx/MANIFEST.in | 3 +-- certbot-nginx/certbot_nginx/configurator.py | 3 ++- .../certbot_nginx/tests/configurator_test.py | 11 ++++++----- .../{ => tls_configs}/options-ssl-nginx-old.conf | 0 .../options-ssl-nginx-tls12-only.conf | 0 .../{ => tls_configs}/options-ssl-nginx.conf | 0 6 files changed, 9 insertions(+), 8 deletions(-) rename certbot-nginx/certbot_nginx/{ => tls_configs}/options-ssl-nginx-old.conf (100%) rename certbot-nginx/certbot_nginx/{ => tls_configs}/options-ssl-nginx-tls12-only.conf (100%) rename certbot-nginx/certbot_nginx/{ => tls_configs}/options-ssl-nginx.conf (100%) diff --git a/certbot-nginx/MANIFEST.in b/certbot-nginx/MANIFEST.in index 8707f9443..3a22c4873 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 4fd5056a3..d3de83593 100644 --- a/certbot-nginx/certbot_nginx/configurator.py +++ b/certbot-nginx/certbot_nginx/configurator.py @@ -129,7 +129,8 @@ class NginxConfigurator(common.Installer): 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 35113aa98..8db202785 100644 --- a/certbot-nginx/certbot_nginx/tests/configurator_test.py +++ b/certbot-nginx/certbot_nginx/tests/configurator_test.py @@ -972,11 +972,12 @@ class InstallSslOptionsConfTest(util.NginxTest): """ 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