mirror of
https://github.com/certbot/certbot.git
synced 2026-08-01 19:02:52 +02:00
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.
This commit is contained in:
+1
-1
@@ -9,7 +9,7 @@ recursive-include acme/schemata *.json
|
|||||||
recursive-include acme/jose/testdata *
|
recursive-include acme/jose/testdata *
|
||||||
|
|
||||||
recursive-include letsencrypt_apache/tests/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 *
|
recursive-include letsencrypt_nginx/tests/testdata *
|
||||||
include letsencrypt_nginx/options-ssl.conf
|
include letsencrypt_nginx/options-ssl.conf
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import pkg_resources
|
|||||||
|
|
||||||
CLI_DEFAULTS = dict(
|
CLI_DEFAULTS = dict(
|
||||||
server_root="/etc/apache2",
|
server_root="/etc/apache2",
|
||||||
mod_ssl_conf="/etc/letsencrypt/options-ssl.conf",
|
mod_ssl_conf="/etc/letsencrypt/options-ssl-apache.conf",
|
||||||
ctl="apache2ctl",
|
ctl="apache2ctl",
|
||||||
enmod="a2enmod",
|
enmod="a2enmod",
|
||||||
init_script="/etc/init.d/apache2",
|
init_script="/etc/init.d/apache2",
|
||||||
@@ -13,7 +13,7 @@ CLI_DEFAULTS = dict(
|
|||||||
|
|
||||||
|
|
||||||
MOD_SSL_CONF = pkg_resources.resource_filename(
|
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
|
"""Path to the Apache mod_ssl config file found in the Let's Encrypt
|
||||||
distribution."""
|
distribution."""
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user