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

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
4 changed files with 20 additions and 2 deletions
+3
View File
@@ -174,6 +174,9 @@ class IConfig(zope.interface.Interface):
key_dir = zope.interface.Attribute("Keys storage.")
cert_dir = zope.interface.Attribute("Certificates and CSRs storage.")
renewer_config_file = zope.interface.Attribute(
"Location of renewal configuration file.")
test_mode = zope.interface.Attribute(
"Test mode. Disables certificate verification.")