From bce01419da21f84acb230caf6c1a60e74ccaf245 Mon Sep 17 00:00:00 2001 From: Francois Marier Date: Sun, 7 Jun 2015 20:31:50 +1200 Subject: [PATCH] Rename the apache config file to match the nginx one Since both config files end up in /etc/letsencrypt/, if we want the two plugins be to installable at the same time, their config files need different names. --- MANIFEST.in | 2 +- letsencrypt_apache/constants.py | 4 ++-- .../{options-ssl.conf => options-ssl-apache.conf} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename letsencrypt_apache/{options-ssl.conf => options-ssl-apache.conf} (100%) diff --git a/MANIFEST.in b/MANIFEST.in index f9364d64f..77b50432a 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -9,7 +9,7 @@ recursive-include acme/schemata *.json recursive-include acme/jose/testdata * recursive-include letsencrypt_apache/tests/testdata * -include letsencrypt_apache/options-ssl.conf +include letsencrypt_apache/options-ssl-apache.conf recursive-include letsencrypt_nginx/tests/testdata * include letsencrypt_nginx/options-ssl.conf diff --git a/letsencrypt_apache/constants.py b/letsencrypt_apache/constants.py index b40e2ac65..bcc3a09bd 100644 --- a/letsencrypt_apache/constants.py +++ b/letsencrypt_apache/constants.py @@ -4,7 +4,7 @@ import pkg_resources CLI_DEFAULTS = dict( server_root="/etc/apache2", - mod_ssl_conf="/etc/letsencrypt/options-ssl.conf", + mod_ssl_conf="/etc/letsencrypt/options-ssl-apache.conf", ctl="apache2ctl", enmod="a2enmod", init_script="/etc/init.d/apache2", @@ -13,7 +13,7 @@ CLI_DEFAULTS = dict( MOD_SSL_CONF = pkg_resources.resource_filename( - "letsencrypt_apache", "options-ssl.conf") + "letsencrypt_apache", "options-ssl-apache.conf") """Path to the Apache mod_ssl config file found in the Let's Encrypt distribution.""" diff --git a/letsencrypt_apache/options-ssl.conf b/letsencrypt_apache/options-ssl-apache.conf similarity index 100% rename from letsencrypt_apache/options-ssl.conf rename to letsencrypt_apache/options-ssl-apache.conf