starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-07-28 08:45:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/letsencrypt/master' into cli-config-fixes

Browse Source 
Conflicts:
	letsencrypt/cli.py
	letsencrypt/constants.py
	letsencrypt/interfaces.py
This commit is contained in:
Jakub Warmuz
2015-05-29 07:42:24 +00:00
parent 71aa1a5348 e15b7b4deb
commit 9ea5e20b44
4 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/constants.py
+1
View File
@@ -25,6 +25,7 @@ CLI_DEFAULTS = dict(
certs_dir=_CLI_DEFAULT_CERT_DIR,
cert_path=os.path.join(_CLI_DEFAULT_CERT_DIR, "cert-letsencrypt.pem"),
chain_path=os.path.join(_CLI_DEFAULT_CERT_DIR, "chain-letsencrypt.pem"),
renewer_config_file=os.path.join(_CLI_DEFAULT_CONFIG_DIR, "renewer.conf"),
test_mode=False,
)
"""Defaults for CLI flags and `.IConfig` attributes."""