constants:DEFAULT_*

This commit is contained in:
Jakub Warmuz
2015-04-02 06:55:50 +00:00
parent 8bc55899e6
commit b76542afb3
2 changed files with 36 additions and 15 deletions
+17
View File
@@ -8,7 +8,24 @@ from letsencrypt.acme import challenges
SETUPTOOLS_PLUGINS_ENTRY_POINT = "letsencrypt.plugins"
"""Setuptools entry point group name for plugins."""
# CLI/IConfig defaults
DEFAULT_VERBOSE_COUNT = -(logging.WARNING / 10)
DEFAULT_SERVER = "letsencrypt-demo.org:443"
DEFAULT_RSA_KEY_SIZE = 2048
DEFAULT_ROLLBACK_CHECKPOINTS = 0
DEFAULT_CONFIG_DIR = "/etc/letsencrypt"
DEFAULT_WORK_DIR = "/var/lib/letsencrypt"
DEFAULT_BACKUP_DIR = "/var/lib/letsencrypt/backups"
DEFAULT_KEY_DIR = "/etc/letsencrypt/keys"
DEFAULT_CERTS_DIR = "/etc/letsencrypt/certs"
DEFAULT_CERT_PATH = "/etc/letsencrypt/certs/cert-letsencrypt.pem"
DEFAULT_CHAIN_PATH = "/etc/letsencrypt/certs/chain-letsencrypt.pem"
DEFAULT_APACHE_SERVER_ROOT = "/etc/apache2"
DEFAULT_APACHE_MOD_SSL_CONF = "/etc/letsencrypt/options-ssl.conf"
DEFAULT_APACHE_CTL = "apache2ctl"
DEFAULT_APACHE_ENMOD = "a2enmod"
DEFAULT_APACHE_INIT_SCRIPT = "/etc/init.d/apache2"
S_SIZE = 32
+19 -15
View File
@@ -262,12 +262,13 @@ def create_parser():
# subparser.add_argument("domains", nargs="*", metavar="domain")
add("-d", "--domains", metavar="DOMAIN", action="append")
add("-s", "--server", default="letsencrypt-demo.org:443",
add("-s", "--server", default=constants.DEFAULT_SERVER,
help=config_help("server"))
add("-k", "--authkey", type=read_file,
help="Path to the authorized key file")
add("-B", "--rsa-key-size", type=int, default=2048, metavar="N",
add("-B", "--rsa-key-size", type=int, metavar="N",
default=constants.DEFAULT_RSA_KEY_SIZE,
help=config_help("rsa_key_size"))
parser_revoke.add_argument(
@@ -278,7 +279,8 @@ def create_parser():
help="Revoke all certs generated by the provided authorized key.")
parser_rollback.add_argument(
"--checkpoints", type=int, default=0, metavar="N",
"--checkpoints", type=int, metavar="N",
default=constants.DEFAULT_ROLLBACK_CHECKPOINTS,
help="Revert configuration N number of checkpoints.")
# TODO: resolve - assumes binary logic while client.py assumes ternary.
@@ -294,31 +296,33 @@ def create_parser():
add("-t", "--text", dest="use_curses", action="store_false",
help="Use the text output instead of the curses UI.")
add("--config-dir", default="/etc/letsencrypt",
add("--config-dir", default=constants.DEFAULT_CONFIG_DIR,
help=config_help("config_dir"))
add("--work-dir", default="/var/lib/letsencrypt",
add("--work-dir", default=constants.DEFAULT_WORK_DIR,
help=config_help("work_dir"))
add("--backup-dir", default="/var/lib/letsencrypt/backups",
add("--backup-dir", default=constants.DEFAULT_BACKUP_DIR,
help=config_help("backup_dir"))
add("--key-dir", default="/etc/letsencrypt/keys",
add("--key-dir", default=constants.DEFAULT_KEY_DIR,
help=config_help("key_dir"))
add("--cert-dir", default="/etc/letsencrypt/certs",
add("--cert-dir", default=constants.DEFAULT_CERTS_DIR,
help=config_help("cert_dir"))
add("--le-vhost-ext", default="-le-ssl.conf",
help=config_help("le_vhost_ext"))
add("--cert-path", default="/etc/letsencrypt/certs/cert-letsencrypt.pem",
add("--cert-path", default=constants.DEFAULT_CERT_PATH,
help=config_help("cert_path"))
add("--chain-path", default="/etc/letsencrypt/certs/chain-letsencrypt.pem",
add("--chain-path", default=constants.DEFAULT_CHAIN_PATH,
help=config_help("chain_path"))
add("--apache-server-root", default="/etc/apache2",
add("--apache-server-root", default=constants.DEFAULT_APACHE_SERVER_ROOT,
help=config_help("apache_server_root"))
add("--apache-mod-ssl-conf", default="/etc/letsencrypt/options-ssl.conf",
add("--apache-mod-ssl-conf", default=constants.DEFAULT_APACHE_MOD_SSL_CONF,
help=config_help("apache_mod_ssl_conf"))
add("--apache-ctl", default="apache2ctl", help=config_help("apache_ctl"))
add("--apache-enmod", default="a2enmod", help=config_help("apache_enmod"))
add("--apache-init-script", default="/etc/init.d/apache2",
add("--apache-ctl", default=constants.DEFAULT_APACHE_CTL,
help=config_help("apache_ctl"))
add("--apache-enmod", default=constants.DEFAULT_APACHE_ENMOD,
help=config_help("apache_enmod"))
add("--apache-init-script", default=constants.DEFAULT_APACHE_INIT_SCRIPT,
help=config_help("apache_init_script"))
return parser