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

Conflicts:
	letsencrypt/constants.py
This commit is contained in:
Jakub Warmuz
2015-06-23 07:47:48 +00:00
56 changed files with 1047 additions and 2368 deletions
-5
View File
@@ -87,8 +87,3 @@ REC_TOKEN_DIR = "recovery_tokens"
RENEWER_CONFIG_FILENAME = "renewer.conf"
"""Renewer config file name (relative to `IConfig.config_dir`)."""
NETSTAT = "/bin/netstat"
"""Location of netstat binary for checking whether a listener is already
running on the specified port (Linux-specific)."""